diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-16 12:13:41 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-16 12:15:43 +0000 |
| commit | c31d55faeb5aa3da1e4566c86aea692eedac6f1f (patch) | |
| tree | f2e4d13cfea5419b12ccdc311a8b78e67fe58e21 | |
| parent | 5e7475e24a4ea0707b9d0b2fc7c24ba117259580 (diff) | |
| download | rspamd-c31d55faeb5aa3da1e4566c86aea692eedac6f1f.tar.gz rspamd-c31d55faeb5aa3da1e4566c86aea692eedac6f1f.zip | |
Fix MISSING_MIMEOLE rule for modern OE
Issue: #514
Reported by: @ilyakruchinin
| -rw-r--r-- | rules/regexp/headers.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua index 394ad2373..437710163 100644 --- a/rules/regexp/headers.lua +++ b/rules/regexp/headers.lua @@ -356,7 +356,12 @@ local has_msmail_pri = 'header_exists(X-MSMail-Priority)' local has_mimeole = 'header_exists(X-MimeOLE)' local has_squirrelmail_in_mailer = 'X-Mailer=/SquirrelMail\\b/H' local has_ips_php_in_mailer = 'X-Mailer=/^IPS PHP Mailer/' -reconf['MISSING_MIMEOLE'] = string.format('(%s) & !(%s) & !(%s) & !(%s) & !(%s) & !(%s)', has_msmail_pri, has_mimeole, has_squirrelmail_in_mailer, xm_mso12, xm_cgpmapi, has_ips_php_in_mailer) +local has_office12145_in_mailer = 'X-Mailer=/^Microsoft (?:Office )?Outlook 1[245]\\.0/' +reconf['MISSING_MIMEOLE'] = string.format('(%s) & !(%s) & !(%s) & !(%s) & !(%s) & !(%s) & !(%s)', + has_msmail_pri, has_mimeole, + has_squirrelmail_in_mailer, xm_mso12, + xm_cgpmapi, has_ips_php_in_mailer, + has_office12145_in_mailer) -- Header delimiters local yandex_from = 'From=/\\@(yandex\\.ru|yandex\\.net|ya\\.ru)/iX' |