Merge pull request #1294 from shawniverson/112423eximlongmsgid

Validate on new exim id format
mailwatch · Jan 7, 2024 · 77596e0 · 77596e0
2 parents fce2aaa + 206c1b1
commit 77596e0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mailscanner/functions.php b/mailscanner/functions.php
@@ -4556,7 +4556,7 @@ function validateInput($input, $type)
  break;
  case 'msgid':
  if (preg_match(
- '/^([A-F0-9]{7,20}\.[A-F0-9]{5}|[0-9B-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]{8,20}|[0-9B-DF-HJ-NP-TV-Zb-df-hj-np-tv-z.]{8,20}\.[A-F0-9]{5}|[0-9A-Za-z]{6}-[A-Za-z0-9]{6}-[A-Za-z0-9]{2}|[0-9A-Za-z]{12,15})$/',
+ '/^([A-F0-9]{7,20}\.[A-F0-9]{5}|[0-9B-DF-HJ-NP-TV-Zb-df-hj-np-tv-z]{8,20}|[0-9B-DF-HJ-NP-TV-Zb-df-hj-np-tv-z.]{8,20}\.[A-F0-9]{5}|[0-9A-Za-z]{6}-[A-Za-z0-9]{6}-[A-Za-z0-9]{2}|[0-9A-Za-z]{6}-[A-Za-z0-9]{11}-[A-Za-z0-9]{4}|[0-9A-Za-z]{12,15})$/',
  $input
  )) {
  return true;