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 2009/11/03 18:30:29 UTC
svn commit: r832479 - in /spamassassin/trunk/rulesrc/sandbox/jhardin:
20_lotsa_money.cf 20_misc_testing.cf 20_tbird_image_spam.cf
Author: jhardin
Date: Tue Nov 3 17:30:29 2009
New Revision: 832479
URL: http://svn.apache.org/viewvc?rev=832479&view=rev
Log:
improve "misspaced From:" metarules a bit
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf
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_lotsa_money.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf?rev=832479&r1=832478&r2=832479&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf Tue Nov 3 17:30:29 2009
@@ -26,6 +26,7 @@
# score MONEY_FREEMAIL 0.5
#endif
+meta MONEY_FROM_RUNON LOTS_OF_MONEY && __FROM_RUNON
meta MONEY_FROM_MISSP LOTS_OF_MONEY && FROM_MISSPACED
describe MONEY_FROM_MISSP Lots of money and misspaced From
score MONEY_FROM_MISSP 1.5
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=832479&r1=832478&r2=832479&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Tue Nov 3 17:30:29 2009
@@ -53,34 +53,32 @@
# From should have whitespace between the comment and the address
+# Better S/O, good enough for standalone rule
header FROM_MISSPACED From =~ /^\s*"[^"]*"</
describe FROM_MISSPACED From: missing whitespace
-header __FROM_RUNON From =~ /\S+<\w+/ # way poor S/O
+# Poorer S/O than FROM_MISSPACED but better performance in metas
+header __FROM_RUNON From =~ /\S+<\w+/
-# To the same
-header TO_MISSPACED To =~ /^\s*"[^"]*"</
-describe TO_MISSPACED To: missing whitespace
-score TO_MISSPACED 0.25
+## To the same
+#header TO_MISSPACED To =~ /^\s*"[^"]*"</
+#describe TO_MISSPACED To: missing whitespace
+#score TO_MISSPACED 0.25
ifplugin Mail::SpamAssassin::Plugin::FreeMail
- meta FROM_MISSP_FREEMAIL FROM_MISSPACED && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
+ meta FROM_MISSP_FREEMAIL __FROM_RUNON && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
describe FROM_MISSP_FREEMAIL From misspaced + freemail provider
-
- meta FROM_RUNON_FREEMAIL __FROM_RUNON && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
+ score FROM_MISSP_FREEMAIL 2.0
endif
-meta FROM_MISSP_MSFT FROM_MISSPACED && (__ANY_OUTLOOK_MUA || __HAS_MIMEOLE || __MIMEOLE_MS)
+meta FROM_MISSP_MSFT __FROM_RUNON && (__ANY_OUTLOOK_MUA || __HAS_MIMEOLE || __MIMEOLE_MS)
describe FROM_MISSP_MSFT From misspaced + supposed Microsoft tool
-score FROM_MISSP_MSFT 3.0
-
-meta FROM_RUNON_MSFT __FROM_RUNON && (__ANY_OUTLOOK_MUA || __HAS_MIMEOLE || __MIMEOLE_MS)
+score FROM_MISSP_MSFT 3.5
-meta FROM_MISSP_DYNIP FROM_MISSPACED && RDNS_DYNAMIC
+meta FROM_MISSP_DYNIP __FROM_RUNON && RDNS_DYNAMIC
describe FROM_MISSP_DYNIP From misspaced + dynamic rDNS
score FROM_MISSP_DYNIP 2.0
-meta FROM_RUNON_DYNIP __FROM_RUNON && RDNS_DYNAMIC
# observed in spam 8/2009
header __MUA_EQ_ORG_1 ALL =~ /\nX-Mailer: ([^\n]+)\n.*Organization: \1\n/ism
@@ -149,7 +147,7 @@
endif
body END_FUTURE_EMAILS /\bend future emails\b/i
-score END_FUTURE_EMAILS 0.25
+score END_FUTURE_EMAILS 0.50
describe END_FUTURE_EMAILS Unsubscribe
body AD_COMPLAINTS /\bcomplaints about this ad+\b/i
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=832479&r1=832478&r2=832479&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf Tue Nov 3 17:30:29 2009
@@ -47,6 +47,7 @@
score TO_NO_BRKTS_FREEMAIL 0.20
endif
+meta TO_NO_BRKTS_FROM_RUNON __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && __FROM_RUNON
meta TO_NO_BRKTS_FROM_MSSP __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && FROM_MISSPACED
score TO_NO_BRKTS_FROM_MSSP 1.00
describe TO_NO_BRKTS_FROM_MSSP Multiple formatting errors