You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2011/02/21 02:18:08 UTC
svn commit: r1072820 - in /spamassassin/trunk/rulesrc/sandbox/jhardin:
20_misc_testing.cf 20_tbird_image_spam.cf
Author: jhardin
Date: Mon Feb 21 01:18:08 2011
New Revision: 1072820
URL: http://svn.apache.org/viewvc?rev=1072820&view=rev
Log:
More FP avoidance
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1072820&r1=1072819&r2=1072820&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Mon Feb 21 01:18:08 2011
@@ -76,7 +76,7 @@ header __FROM_RUNON Fro
meta FROM_MISSP_SPF_FAIL (__FROM_RUNON && SPF_FAIL)
tflags FROM_MISSP_SPF_FAIL net
-meta FROM_MISSP_EH_MATCH (__FROM_RUNON && __ENV_AND_HDR_FROM_MATCH) && !__RCD_RDNS_MTA_MESSY
+meta FROM_MISSP_EH_MATCH (__FROM_RUNON && __ENV_AND_HDR_FROM_MATCH) && !__RCD_RDNS_MTA_MESSY && !__UNSUB_LINK && !__COMMENT_EXISTS
describe FROM_MISSP_EH_MATCH From misspaced, matches envelope
meta FROM_MISSP_URI (__FROM_RUNON && __HAS_ANY_URI) && !__NOT_SPOOFED && !__RCD_RDNS_MTA_MESSY && !MISSING_MIMEOLE && !__COMMENT_EXISTS && !__REPTO_QUOTE
@@ -203,7 +203,8 @@ describe WIKI_IMG Image
header SUBJ_RE_CLNCLN Subject =~ /^\s*RE::/
describe SUBJ_RE_CLNCLN Subject RE::
-uri MANY_SUBDOM m;^https?://(?:[^\./]{1,30}\.){6};
+uri __MANY_SUBDOM m;^https?://(?:[^\./]{1,30}\.){6};
+meta MANY_SUBDOM __MANY_SUBDOM && !__JM_REACTOR_DATE && !__UNSUB_LINK && !__VIA_ML
describe MANY_SUBDOM Lots and lots of subdomain parts in a URI
# by request of Benny Pedersen <me...@junc.org> on the users list 10/9/2009
@@ -249,10 +250,10 @@ describe FROM_IN_TO_AND_SUBJ From
tflags FROM_IN_TO_AND_SUBJ publish
header __SUBJ_HAS_TO_1 ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>,]+)>?\n(?:[^\n]{1,100}\n)*Subject:\s+[^\n]{0,100}\1[>,\s\n]/ism
-meta TO_IN_SUBJ __SUBJ_HAS_TO_1 && !__VIA_ML && !MISSING_MIMEOLE
+meta TO_IN_SUBJ __SUBJ_HAS_TO_1 && !__VIA_ML && !MISSING_MIMEOLE && !__THREAD_INDEX_GOOD
describe TO_IN_SUBJ To address is in Subject
-meta TO_EQ_FM_HTML_ONLY (__TO_EQ_FROM && MIME_HTML_ONLY && !HTML_MIME_NO_HTML_TAG && !MISSING_MID && !ALL_TRUSTED)
+meta TO_EQ_FM_HTML_ONLY (__TO_EQ_FROM && MIME_HTML_ONLY && !HTML_MIME_NO_HTML_TAG && !MISSING_MID && !ALL_TRUSTED) && !__RCD_RDNS_MAIL_MESSY
describe TO_EQ_FM_HTML_ONLY To == From and HTML only
tflags TO_EQ_FM_HTML_ONLY publish
@@ -275,7 +276,7 @@ meta __TO_EQ_FROM_DOM (__T
describe __TO_EQ_FROM_DOM To: domain same as From: domain
#tflags __TO_EQ_FROM_DOM publish
-meta TO_EQ_FM_DOM_HTML_ONLY (__TO_EQ_FROM_DOM && MIME_HTML_ONLY && !__CTYPE_MULTIPART_ALT && !HTML_MIME_NO_HTML_TAG && !ALL_TRUSTED && !__MIME_QP && !__IS_EXCH) && !__MSGID_BEFORE_RECEIVED
+meta TO_EQ_FM_DOM_HTML_ONLY (__TO_EQ_FROM_DOM && MIME_HTML_ONLY && !__CTYPE_MULTIPART_ALT && !HTML_MIME_NO_HTML_TAG && !ALL_TRUSTED && !__MIME_QP && !__IS_EXCH) && !__MSGID_BEFORE_RECEIVED && !__RCD_RDNS_MAIL_MESSY
describe TO_EQ_FM_DOM_HTML_ONLY To domain == From domain and HTML only
#tflags TO_EQ_FM_DOM_HTML_ONLY publish
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf?rev=1072820&r1=1072819&r2=1072820&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf Mon Feb 21 01:18:08 2011
@@ -41,11 +41,11 @@ meta TO_NO_BRKTS_DYNIP __TO_
describe TO_NO_BRKTS_DYNIP To: misformatted and dynamic rDNS
tflags TO_NO_BRKTS_DYNIP publish
-meta TO_NO_BRKTS_NORDNS __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && RDNS_NONE && !__MANY_RECIPS && !__FROM_RUNON && !__VIA_ML && !__TO___LOWER && !ALL_TRUSTED && !__TO_EQ_FROM_DOM && !__DOS_REF_TODAY
+meta TO_NO_BRKTS_NORDNS __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && RDNS_NONE && !__MANY_RECIPS && !__FROM_RUNON && !__VIA_ML && !__TO___LOWER && !ALL_TRUSTED && !__TO_EQ_FROM_DOM && !__DOS_REF_TODAY && (__HDRS_LCASE > 1)
score TO_NO_BRKTS_NORDNS 0.20
describe TO_NO_BRKTS_NORDNS To: misformatted and no rDNS
-meta TO_NO_BRKTS_NORDNS_HTML __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && RDNS_NONE && MIME_HTML_ONLY && !__MIME_QP && !__MSGID_JAVAMAIL && !__REPLYTO_EXISTS && !__MSGID_BEFORE_RECEIVED && !__VIA_ML && !__UA_MUTT && !__FROM_FREEMAIL && !__HAS_X_MAILER && !__COMMENT_EXISTS && !__HTML_LENGTH_384
+meta TO_NO_BRKTS_NORDNS_HTML __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && RDNS_NONE && MIME_HTML_ONLY && !__MIME_QP && !__MSGID_JAVAMAIL && !__REPLYTO_EXISTS && !__MSGID_BEFORE_RECEIVED && !__VIA_ML && !__UA_MUTT && !__FROM_FREEMAIL && !__HAS_X_MAILER && !__COMMENT_EXISTS && !__HTML_LENGTH_384 && !__MIME_BASE64
score TO_NO_BRKTS_NORDNS_HTML 0.20
describe TO_NO_BRKTS_NORDNS_HTML To: misformatted and no rDNS and HTML only
@@ -61,7 +61,7 @@ meta TO_NO_BRKTS_DIRECT __TO
describe TO_NO_BRKTS_DIRECT To: misformatted and direct-to-MX
tflags TO_NO_BRKTS_DIRECT publish
-meta TO_NO_BRKTS_NOTLIST __TO_NO_ARROWS_R && !__VIA_ML && !__UNUSABLE_MSGID && !__THREADED && !__SUBJ_RE && !__MIME_QP && !__COMMENT_EXISTS && !__RCD_RDNS_MAIL_MESSY && !__CTYPE_MULTIPART_ALT && !__MANY_RECIPS && !__DOS_RELAYED_EXT && !__HAS_MIMEOLE && !__THREAD_INDEX_GOOD && !__IMS_MSGID && !__RCD_RDNS_MTA_MESSY && !__MSGID_OK_HOST && !__BOUNCE_RPATH_NULL && !__BOUNCE_STAT_FAIL && !__BOUNCE_CTYPE && !ALL_TRUSTED && !__FB_DO_NOT_REPLY && !__NOT_SPOOFED && !__DEAL
+meta TO_NO_BRKTS_NOTLIST __TO_NO_ARROWS_R && !__VIA_ML && !__UNUSABLE_MSGID && !__THREADED && !__SUBJ_RE && !__MIME_QP && !__COMMENT_EXISTS && !__RCD_RDNS_MAIL_MESSY && !__CTYPE_MULTIPART_ALT && !__MANY_RECIPS && !__DOS_RELAYED_EXT && !__HAS_MIMEOLE && !__THREAD_INDEX_GOOD && !__IMS_MSGID && !__RCD_RDNS_MTA_MESSY && !__MSGID_OK_HOST && !__BOUNCE_RPATH_NULL && !__BOUNCE_STAT_FAIL && !__BOUNCE_CTYPE && !ALL_TRUSTED && !__FB_DO_NOT_REPLY && !__NOT_SPOOFED && !__DEAL && !__FH_HAS_XPRIORITY
describe TO_NO_BRKTS_NOTLIST To: misformatted and not a mailing list