aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-09-15 22:42:41 +0100
committerGitHub <noreply@github.com>2023-09-15 22:42:41 +0100
commit073f82b22738877738c31772efed07afad191dc1 (patch)
tree05fff65b4884fb8e89f5ed70fb584bf61c2ef77e
parent5413b5dc14957b4d6d9a601c447910ecf5a7167d (diff)
parentf66bd5ac035b0910fe6a35b2b399d01d43e6979c (diff)
downloadrspamd-073f82b22738877738c31772efed07afad191dc1.tar.gz
rspamd-073f82b22738877738c31772efed07afad191dc1.zip
Merge pull request #4600 from fatalbanana/missing_mimeole_fp
[Fix] MISSING_MIMEOLE: avoid matching messages from Android GMail app (#4561)
-rw-r--r--rules/regexp/headers.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index b634dd909..c4411e53a 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'