From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 14 Sep 2023 15:51:49 +0000 (+0200)
Subject: [Fix] MISSING_MIMEOLE: avoid matching messages from Android GMail app (#4561)
X-Git-Tag: 3.7.1~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4600%2Fhead;p=thirdparty%2Frspamd.git

[Fix] MISSING_MIMEOLE: avoid matching messages from Android GMail app (#4561)
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index b634dd9097..c4411e53aa 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -642,12 +642,14 @@ 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_office_version_in_mailer = [[X-Mailer=/^Microsoft (?:Office )?Outlook [12]\d\.0/]]
+local has_x_android_message_id = 'header_exists(X-Android-Message-Id)'
 reconf['MISSING_MIMEOLE'] = {
-  re = string.format('(%s) & !(%s) & !(%s) & !(%s)',
+  re = string.format('(%s) & !(%s) & !(%s) & !(%s) & !(%s)',
       has_msmail_pri,
       has_mimeole,
       has_squirrelmail_in_mailer,
-      has_office_version_in_mailer),
+      has_office_version_in_mailer,
+      has_x_android_message_id),
   score = 2.0,
   description = 'Mime-OLE is needed but absent (e.g. fake Outlook or fake Exchange)',
   group = 'headers'