https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8202
Bill Cole <billc...@apache.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Resolution|--- |FIXED
Status|NEW |RESOLVED
--- Comment #7 from Bill Cole <billc...@apache.org> ---
Change proved more complex than anticipated. Apparently something was broken
about just adding a sub-rule for Microsoft's imposed MIDs, as the intermediate
__UNUSABLE_MSGID sub-rule does not hit if left with the sub-rule prefix. I had
to make it an explicit rule or it would not match. Patchset for files in the
default rules directory.
Index: 20_meta_tests.cf
===================================================================
--- 20_meta_tests.cf (revision 1913984)
+++ 20_meta_tests.cf (working copy)
@@ -50,7 +50,7 @@
#header __MOZILLA_MUA X-Mailer =~ /\bMozilla\b/
header __MOZILLA_MUA User-Agent =~ /^mozilla\b/i
header __MOZILLA_MSGID MESSAGEID =~
/^<(?:[a-f\d]{8}-(?:[a-f\d]{4}-){3}[a-f\d]{12}|[A-F\d]{8}\.[A-F1-9][A-F\d]{0,7})\@\S+>$/m
-meta FORGED_MUA_MOZILLA (__MOZILLA_MUA && !__UNUSABLE_MSGID &&
!__MOZILLA_MSGID)
+meta FORGED_MUA_MOZILLA (__MOZILLA_MUA && ! UNUSABLE_MSGID && !
__MOZILLA_MSGID)
describe FORGED_MUA_MOZILLA Forged mail pretending to be from Mozilla
header __PC_RND_HEADER ALL =~ /%RA?ND(?:OM)?(?:_|\b|[A-Z]{3})/i
Index: 20_ratware.cf
===================================================================
--- 20_ratware.cf (revision 1913984)
+++ 20_ratware.cf (working copy)
@@ -63,8 +63,12 @@
meta __GROUPSIO_GATED __GROUPSIO_MSGID && __HAS_XORIGMSGID
-meta __UNUSABLE_MSGID (__LYRIS_EZLM_REMAILER || __GATED_THROUGH_RCVD_REMOVER
|| __WACKY_SENDMAIL_VERSION || __IPLANET_MESSAGING_SERVER ||
__HOTMAIL_BAYDAV_MSGID || __SYMPATICO_MSGID && __GROUPSIO_GATED)
+#Outlook.com generates its own MIDs forcibly
+header __MCRSFT_MSGID MESSAGEID =~
/^<[[:alnum:]]{30,45}@[^>]*\.(outlook|exchangelabs).com>$/im
+meta UNUSABLE_MSGID (__MCRSFT_MSGID || __LYRIS_EZLM_REMAILER ||
__GATED_THROUGH_RCVD_REMOVER || __WACKY_SENDMAIL_VERSION ||
__IPLANET_MESSAGING_SERVER || __HOTMAIL_BAYDAV_MSGID || __SYMPATICO_MSGID &&
__GROUPSIO_GATED)
+describe UNUSABLE_MSGID Message-ID header not useful for certain tests
+
## now on to the forgery rules
# AOL
Index: 50_scores.cf
===================================================================
--- 50_scores.cf (revision 1913984)
+++ 50_scores.cf (working copy)
@@ -111,6 +111,7 @@
score FORGED_MSGID_HOTMAIL 0 # n=0 n=1 n=2 n=3
score FORGED_MSGID_MSN 0 # n=0 n=1 n=2 n=3
score FORGED_MSGID_YAHOO 0.1
+score UNUSABLE_MSGID 0.001
score FORGED_MUA_EUDORA 2.828 2.510 1.962 0.001
score FORGED_MUA_IMS 2.399 2.399 2.399 1.943
score FORGED_MUA_MOZILLA 2.399 1.596 2.399 2.309
$ svn commit -m "Additional exception for UNUSABLE_MSGID and hence
FORGED_MUA_MOZILLA and other metas. Bug 8202"
Authentication realm: <https://svn.apache.org:443> ASF Committers
Password for 'billcole': ***************
Sending 20_meta_tests.cf
Sending 20_ratware.cf
Sending 50_scores.cf
Transmitting file data ...done
Committing transaction...
Committed revision 1914343.
--
You are receiving this mail because:
You are the assignee for the bug.
