svn commit: r612249 - /spamassassin/rules/trunk/sandbox/sidney/70_other.cf

[si...@apache.org]

Author: sidney
Date: Tue Jan 15 14:21:25 2008
New Revision: 612249

URL: http://svn.apache.org/viewvc?rev=612249&view=rev
Log:
bug 5666: rewrite rules for OE/OL forgery

Modified:
    spamassassin/rules/trunk/sandbox/sidney/70_other.cf

Modified: spamassassin/rules/trunk/sandbox/sidney/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/sidney/70_other.cf?rev=612249&r1=612248&r2=612249&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/sidney/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/sidney/70_other.cf Tue Jan 15 14:21:25 2008
@@ -11,6 +11,8 @@
 body T_SIDNEY_HG_HORMONE_LIBERALDOTS /\bH.G.H\b/i
 body T_SIDNEY_HG_HORMONE_NO_ABBREV /\b(?:human growth hormone)\b/i
 
+### rewrite of tests for OE/OL forgery
+
 # meta rule form of check_messageid_not_usable
  # Lyris eats message-ids.  also some ezmlm, I think :(
 header T_SIDNEY__LYRIS_EZLM_REMAILER  List-Unsubscribe =~ /<mailto:(?:leave-\S+|\S+-unsubscribe)\@\S+>$/
@@ -26,18 +28,15 @@
 # Apr  2 2003 jm: iPlanet rewrites lots of stuff, including Message-IDs
 header T_SIDNEY__IPLANET_MESSAGING_SERVER Received =~ /iPlanet Messaging Server/
 
-# The whole enchilada - non-eval version of __UNUSABLE_MSGID
-meta T_SIDNEY__UNUSABLE_MSGID (T_SIDNEY__LYRIS_EZLM_REMAILER || T_SIDNEY__GATED_THROUGH_RCVD_REMOVER || T_SIDNEY__WACKY_SENDMAIL_VERSION || T_SIDNEY__IPLANET_MESSAGING_SERVER)
+# the former __OE_MSGID_3, now what it really is, a test for Hotmail servers munging Message-IDs
+header T_SIDNEY__HOTMAIL_BAYDAV_MSGID		MESSAGEID =~ /^<BAY\d+-DAV\d+[A-Z0-9]{25}\@phx\.gbl>$/m
 
-# easy checks if correct
-meta T_SIDNEY_UNUSABLE_POS_CHECK (__UNUSABLE_MSGID && T_SIDNEY__UNUSABLE_MSGID)
-meta T_SIDNEY_UNUSABLE_NEG_CHECK (__UNUSABLE_MSGID && !T_SIDNEY__UNUSABLE_MSGID)
-meta T_SIDNEY_UNUSABLE_NEG2_CHECK (!__UNUSABLE_MSGID && T_SIDNEY__UNUSABLE_MSGID)
+# the former __OE_MSGID_3, now what it really is, a test for Hotmail servers munging Message-IDs
+header T_SIDNEY__SYMPATICO_MSGID		MESSAGEID =~ /^<BAYC\d+-PASMTP\d+[A-Z0-9]{25}\@CEZ\.ICE>$/m
 
-# Test this as substitute for FORGED_MUA_OUTLOOK
-meta T_SIDNEY__FORGED_OE    (__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__OE_MSGID_3 && !T_SIDNEY__UNUSABLE_MSGID)
+# The whole enchilada - non-eval version of __UNUSABLE_MSGID
+meta T_SIDNEY__UNUSABLE_MSGID (T_SIDNEY__LYRIS_EZLM_REMAILER || T_SIDNEY__GATED_THROUGH_RCVD_REMOVER || T_SIDNEY__WACKY_SENDMAIL_VERSION || T_SIDNEY__IPLANET_MESSAGING_SERVER || T_SIDNEY__HOTMAIL_BAYDAV_MSGID || T_SIDNEY__SYMPATICO_MSGID)
+
+meta T_SIDNEY__FORGED_OE    (__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !T_SIDNEY__UNUSABLE_MSGID)
 meta T_SIDNEY_FORGED_MUA_OUTLOOK   (T_SIDNEY__FORGED_OE || __FORGED_OUTLOOK_DOLLARS)
-meta T_SIDNEY__FORGED_OE_A    (__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__OE_MSGID_3 && !MSGID_FROM_MTA_HEADER && !T_SIDNEY__UNUSABLE_MSGID)
-meta T_SIDNEY_FORGED_MUA_OUTLOOK_A   (T_SIDNEY__FORGED_OE_A || __FORGED_OUTLOOK_DOLLARS)
-# test for what is will be missed by new test
-meta T_SIDNEY__FORGED_OE_B    (__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__OE_MSGID_3 && MSGID_FROM_MTA_HEADER && !T_SIDNEY__UNUSABLE_MSGID)
+