aboutsummaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-16 12:13:41 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-16 12:13:41 +0000
commit7482b059314b42e32ebbd6f9431af9951794dfe2 (patch)
tree80ed62be9565ed9769fe56ff13b0afe91b802dcc /rules
parentbd9428b14979c7f06cc7871498e93f1893f1ec4f (diff)
downloadrspamd-7482b059314b42e32ebbd6f9431af9951794dfe2.tar.gz
rspamd-7482b059314b42e32ebbd6f9431af9951794dfe2.zip
Fix MISSING_MIMEOLE rule for modern OE
Issue: #514 Reported by: @ilyakruchinin
Diffstat (limited to 'rules')
-rw-r--r--rules/regexp/headers.lua7
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'