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 2013/06/16 04:24:48 UTC

svn commit: r1493443 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf

Author: jhardin
Date: Sun Jun 16 02:24:47 2013
New Revision: 1493443

URL: http://svn.apache.org/r1493443
Log:
Tweak STYLE_GIBBERISH

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.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=1493443&r1=1493442&r2=1493443&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Sun Jun 16 02:24:47 2013
@@ -497,10 +497,12 @@ endif
 
 
 body           __STYLE_TAG_IN_BODY      /<style(?:[^>]{0,30})?>/i
+body           __BODY_XHTML             /<x-html>/i
 rawbody        __STYLE_GIBBERISH_1      /<style[^>]{0,30}>(?:\s{0,80}[^\s:;<]){150}/im
 rawbody        __STYLE_GIBBERISH_2      /\.style\w{0,20}\s{1,10}\{[^:;]{200}/im
-meta           __STYLE_GIBBERISH        (__STYLE_GIBBERISH_1 || __STYLE_GIBBERISH_2)
-meta           STYLE_GIBBERISH          __STYLE_GIBBERISH && !__STYLE_TAG_IN_BODY && !__THREADED && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_DIAL_MESSY && !__HAS_REPLY_TO && !MIME_HTML_MOSTLY
+rawbody        __STYLE_GIBBERISH_3      /<style[^>]{0,30}>\s{0,30}(?:[a-z0-9_:]{1,30}\s{0,10}\{[^}]{1,50}\}\s{0,80}){1,5}(?:\w{1,30}\s{1,10}){30}/im
+meta           __STYLE_GIBBERISH        (__STYLE_GIBBERISH_1 || __STYLE_GIBBERISH_2 || __STYLE_GIBBERISH_3)
+meta           STYLE_GIBBERISH          __STYLE_GIBBERISH && (__BODY_XHTML || !__STYLE_TAG_IN_BODY) && !__THREADED && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_DIAL_MESSY && !__HAS_REPLY_TO && !MIME_HTML_MOSTLY
 describe       STYLE_GIBBERISH          Nonsense in HTML <STYLE> tag
 
 body           __SCRIPT_TAG_IN_BODY     /<script>/i
@@ -1119,5 +1121,7 @@ describe    HTML_FONT_ONE_WORD_MANY   Ma
 score       HTML_FONT_ONE_WORD_MANY   0.50	# limit (initial)
 
 
+body        ADMITS_CANSPAM    /\bThis is a CANSPAM ACT compliant advertising broadcast\b/i
+describe    ADMITS_CANSPAM    Admits to being spam