You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2007/09/17 02:15:12 UTC
svn commit: r576221 - /spamassassin/rules/trunk/sandbox/dos/70_other.cf
Author: dos
Date: Sun Sep 16 17:15:11 2007
New Revision: 576221
URL: http://svn.apache.org/viewvc?rev=576221&view=rev
Log:
sandbox: avoid direct-to-mx hits on mailing list processed mail; also detect when we've ignored a received header that provides no 'useful' info (such as MDaemon 8, qmail, etc)
Modified:
spamassassin/rules/trunk/sandbox/dos/70_other.cf
Modified: spamassassin/rules/trunk/sandbox/dos/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/dos/70_other.cf?rev=576221&r1=576220&r2=576221&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/dos/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/dos/70_other.cf Sun Sep 16 17:15:11 2007
@@ -200,18 +200,24 @@
score DOS_STOCK_CDYV_GENERIC 2.5
# 20070905 - GIF spam
-meta DOS_OUTLOOK_TO_MX __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_SINGLE_EXT_RELAY && !DOS_OUTLOOK_TO_MX_IMAGE
+header __DOS_HAS_LIST_ID exists:List-ID
+header __DOS_HAS_LIST_UNSUB exists:List-Unsubscribe
+header __DOS_HAS_MAILING_LIST exists:Mailing-List
+# we complete ignore(!) received headers we can't get "useful" info from, which screws up detecting direct-to-mx
+header __DOS_RELAYED_EXT ALL-EXTERNAL =~ /(?:^|\n)[Rr][eE][cC][eE][iI][vV][eE][dD]:\s.+\n[Rr][eE][cC][eE][iI][vV][eE][dD]:\s/s
+meta __DOS_DIRECT_TO_MX __DOS_SINGLE_EXT_RELAY && !__DOS_HAS_LIST_ID && !__DOS_HAS_LIST_UNSUB && !__DOS_HAS_MAILING_LIST && !__DOS_RELAYED_EXT
+
+meta DOS_OUTLOOK_TO_MX __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_DIRECT_TO_MX && !DOS_OUTLOOK_TO_MX_IMAGE
describe DOS_OUTLOOK_TO_MX Delivered direct to MX with Outlook headers
-# 20070907 - GIF spam
-meta DOS_OE_TO_MX __OE_MUA && __DOS_SINGLE_EXT_RELAY && !DOS_OE_TO_MX_IMAGE
+meta DOS_OUTLOOK_TO_MX_IMAGE __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_DIRECT_TO_MX && __ANY_IMAGE_ATTACH
+describe DOS_OUTLOOK_TO_MX_IMAGE Direct to MX with Outlook headers and an image
+
+meta DOS_OE_TO_MX __OE_MUA && __DOS_DIRECT_TO_MX && !DOS_OE_TO_MX_IMAGE
describe DOS_OE_TO_MX Delivered direct to MX with OE headers
-meta DOS_OE_TO_MX_IMAGE __OE_MUA && __DOS_SINGLE_EXT_RELAY && __ANY_IMAGE_ATTACH
+meta DOS_OE_TO_MX_IMAGE __OE_MUA && __DOS_DIRECT_TO_MX && __ANY_IMAGE_ATTACH
describe DOS_OE_TO_MX_IMAGE Direct to MX with OE headers and an image
-
-meta DOS_OUTLOOK_TO_MX_IMAGE __ANY_OUTLOOK_MUA && !__OE_MUA && __DOS_SINGLE_EXT_RELAY && __ANY_IMAGE_ATTACH
-describe DOS_OUTLOOK_TO_MX_IMAGE Direct to MX with Outlook headers and an image
# 20070907 - Google "I'm feeling lucky" redirect
uri DOS_GOOGLE_LUCKY_REDIRECT m{^http://[^/]\.google\.[^/]/search?(?:.*&|&?)btnI=?}