summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorDmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>2023-07-11 21:22:17 +0300
committerGitHub <noreply@github.com>2023-07-11 21:22:17 +0300
commita0d7e033663e217d84178be5db3153a7249555b5 (patch)
tree5c557e0375289a0b1ab45a3df0bca9b29140386e /rules
parentd0c02ee183b67f87a4e4e13fc6dfbf072620b464 (diff)
downloadrspamd-a0d7e033663e217d84178be5db3153a7249555b5.tar.gz
rspamd-a0d7e033663e217d84178be5db3153a7249555b5.zip
Support regex rules to detect Apple Mail
Diffstat (limited to 'rules')
-rw-r--r--rules/regexp/headers.lua23
1 files changed, 20 insertions, 3 deletions
diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 4a14fafc1..d6b8b3a08 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -963,6 +963,26 @@ reconf['OLD_X_MAILER'] = {
group = 'headers',
}
+-- Detect Apple Mail
+local apple_x_mailer = [[Apple Mail \(((Version )?[1-9]\.[0-9]*|[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)\)]]
+reconf['APPLE_MAILER'] = {
+ description = 'Sent with Apple Mail',
+ re = string.format('X-Mailer=/^%s/{header}', apple_x_mailer),
+ score = 0.0,
+ group = 'headers',
+}
+
+-- Detect Apple iPhone/iPad Mail
+-- Apple iPhone/iPad Mail X-Mailer contains iOS build number, e. g. 9B206, 16H5, 18G5023c
+-- https://en.wikipedia.org/wiki/IOS_version_history
+local apple_ios_x_mailer = [[i(?:Phone|Pad) Mail \((?:1[AC]|[34][AB]|5[ABCFGH]|7[A-E]|8[ABCEFGHJKL]|9[AB]|\d{2}[A-Z])\d+[a-z]?\)]]
+reconf['APPLE_IOS_MAILER'] = {
+ description = 'Sent with Apple iPhone/iPad Mail',
+ re = string.format('X-Mailer=/^%s/{header}', apple_ios_x_mailer),
+ score = 0.0,
+ group = 'headers',
+}
+
-- X-Mailer header values which should not occur (in the modern mail) at all
local bad_x_mailers = {
-- header name repeated in the header value
@@ -978,9 +998,6 @@ local bad_x_mailers = {
-- but starts with 'iPhone Mail' or 'iPad Mail' is likely fake
[[i(?:Phone|Pad) Mail]],
}
--- Apple iPhone/iPad Mail X-Mailer contains iOS build number, e. g. 9B206, 16H5, 18G5023c
--- https://en.wikipedia.org/wiki/IOS_version_history
-local apple_ios_x_mailer = [[i(?:Phone|Pad) Mail \((?:1[AC]|[34][AB]|5[ABCFGH]|7[A-E]|8[ABCEFGHJKL]|9[AB]|\d{2}[A-Z])\d+[a-z]?\)]]
reconf['FORGED_X_MAILER'] = {
description = 'Forged X-Mailer header',