commit 7bed05f: [Minor] A bit better apple_x_mailer regex

GitHub noreply at github.com
Thu Jul 13 14:49:03 UTC 2023


Author: Dmitriy Alekseev
Date: 2023-07-12 14:00:25 +0300
URL: https://github.com/rspamd/rspamd/commit/7bed05f8f64cc52e070ded3f81f1e8918918c12c

[Minor] A bit better apple_x_mailer regex

---
 rules/regexp/headers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 85d6cfcfd..cc4560600 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -964,7 +964,7 @@ reconf['OLD_X_MAILER'] = {
 }
 
 -- Detect Apple Mail
-local apple_x_mailer = [[Apple Mail \(((Version )?[1-9]\.[0-9]*|[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)\)]]
+local apple_x_mailer = [[Apple Mail \((?:(?:Version )?[1-9]\d{0,2}\.\d{1,3}|[1-9]\d{0,2}\.\d{1,3}\.\d{1,3}\.\d{1,3})\)]]
 reconf['APPLE_MAILER'] = {
   description = 'Sent with Apple Mail',
   re = string.format('X-Mailer=/^%s/{header}', apple_x_mailer),


More information about the Commits mailing list