[Minor] Suppress *_BASE64 for mails sent with Mail.Ru web-mail (#902)

diff --git a/conf/composites.conf b/conf/composites.conf
index f414fa9f0cc202c953139d1700eefd5618be2744..b05a92b94dcdc4146bea2e161a070f353ad096be 100644 (file)
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -52,6 +52,9 @@ composite "DKIM_MIXED" {
     expression = "-R_DKIM_ALLOW & (R_DKIM_DNSFAIL | R_DKIM_PERMFAIL | R_DKIM_REJECT)"
     policy = "remove_weight";
 }
+composite "MAIL_RU_MAILER_BASE64" {
+    expression = "MAIL_RU_MAILER & (FROM_EXCESS_BASE64 | REPLYTO_EXCESS_BASE64 | TO_EXCESS_BASE64)";
+}
 
 .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"
 .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/composites.conf"

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 143171ae222bf8ea58e536ed0e04d79139137cd4..414a13aefcf387bab85e75187772d52a707aa5d9 100644 (file)
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -565,6 +565,16 @@ reconf['FORGED_MUA_THEBAT_BOUN'] = {
   group = 'header'
 }
 
+-- Detect Mail.Ru web-mail
+local xm_mail_ru_mailer_1_0 = 'X-Mailer=/^Mail\\.Ru Mailer 1\\.0$/H'
+local rcvd_e_mail_ru = 'Received=/^from \\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\] by e\\.mail\\.ru with HTTP;/mH'
+reconf['MAIL_RU_MAILER'] = {
+  re = string.format('(%s) & (%s)', xm_mail_ru_mailer_1_0, rcvd_e_mail_ru),
+  score = 0.0,
+  description = 'Sent with Mail.Ru web-mail',
+  group = 'header'
+}
+
 -- Two received headers with ip addresses
 local double_ip_spam_1 = 'Received=/from \\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\] by \\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3} with/H'
 local double_ip_spam_2 = 'Received=/from\\s+\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\s+by\\s+\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3};/H'