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 2014/06/26 16:25:03 UTC

svn commit: r1605795 - in /spamassassin/trunk/rulesrc/sandbox/jhardin: 20_lotsa_money.cf 20_misc_testing.cf

Author: jhardin
Date: Thu Jun 26 14:25:03 2014
New Revision: 1605795

URL: http://svn.apache.org/r1605795
Log:
FP avoidance, score limits

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.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=1605795&r1=1605794&r2=1605795&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf Thu Jun 26 14:25:03 2014
@@ -57,7 +57,7 @@ describe MONEY_FORM          Lots of mon
 meta     __MONEY_FORM_SHORT  LOTS_OF_MONEY && __FILL_THIS_FORM_SHORT
 meta     MONEY_FORM_SHORT    __MONEY_FORM_SHORT && !__DOS_HAS_LIST_UNSUB && !__VIA_ML && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__THREADED && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__THREAD_INDEX_GOOD 
 describe MONEY_FORM_SHORT    Lots of money if you fill out a short form
-#score    MONEY_FORM_SHORT    0.5
+score    MONEY_FORM_SHORT    2.500	# limit
 
 #meta     MONEY_ACCOUNT    LOTS_OF_MONEY && __YOUR_ACCOUNT
 #describe MONEY_ACCOUNT    Lots of money to your account

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=1605795&r1=1605794&r2=1605795&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Thu Jun 26 14:25:03 2014
@@ -1439,8 +1439,10 @@ meta        __45_ALNUM_URI_O    __45_ALN
 meta        __45_ALNUM_IMG_O    __45_ALNUM_IMG && !__64_ANY_IMG && !__128_ALNUM_IMG && !__128_LC_IMG
 meta        __45_ALNUM_URI_IMG  __45_ALNUM_URI_O && __45_ALNUM_IMG_O
 
-meta        LONG_IMG_URI        __45_ALNUM_IMG && !ALL_TRUSTED
+meta        LONG_IMG_URI        __45_ALNUM_IMG && !ALL_TRUSTED && !__HAS_ERRORS_TO 
 describe    LONG_IMG_URI        Image URI with very long path component - web bug?
+score       LONG_IMG_URI        3.000	# limit
+tflags      LONG_IMG_URI        publish
 
 
 rawbody     __HTML_OFF_PAGE   /;(?:top|left):-\d{3,9}px;/i
@@ -1477,14 +1479,16 @@ body        DR_OZ_OBFU        /\bD(?:r\.
 describe    DR_OZ_OBFU        Obfuscated "Dr. Oz"
 
 
-body        ADMAIL            /(?:\b|_)ad-?(?:mail|message)s?(?:\b|_)/i
+body        __ADMAIL          /(?:\b|_)ad-?(?:mail|message)s?(?:\b|_)/i
+meta        ADMAIL            __ADMAIL && !__DKIM_EXISTS && !__COMMENT_EXISTS 
 describe    ADMAIL            "admail" and variants
 tflags      ADMAIL            publish
 
 body        ORS               /\bOn-?line Rate Saver\b/i
 describe    ORS               "Online Rate Saver"
 
-body        THIS_AD           /(?:\b|_)this[- _]+(?:ad(?:vert[i1l]sement)?|promo(?:tion)?)(?:\b|_)/i
+body        __THIS_AD         /(?:\b|_)this[- _]+(?:ad(?:vert[i1l]sement)?|promo(?:tion)?)(?:\b|_)/i
+meta        THIS_AD           __THIS_AD && !__HTML_LINK_IMAGE && !__DKIM_EXISTS 
 describe    THIS_AD           "This ad" and variants
 tflags      THIS_AD           publish
 
@@ -1497,6 +1501,7 @@ score       OPT_OUT           2.000
 
 uri         URI_OPTOUT_USME   m,^https?://(?:quit|bye|remove|exit|leave)\.[^/]+\.(?:us|me)\b,i
 describe    URI_OPTOUT_USME   Opt-out URI
+tflags      URI_OPTOUT_USME   publish