From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 16 Feb 2016 12:13:41 +0000 (+0000)
Subject: Fix MISSING_MIMEOLE rule for modern OE
X-Git-Tag: 1.2.0~223
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7482b059314b42e32ebbd6f9431af9951794dfe2;p=rspamd.git

Fix MISSING_MIMEOLE rule for modern OE

Issue: #514
Reported by: @ilyakruchinin
---

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'