svn commit: rev 9573 - in incubator/spamassassin/trunk: lib/Mail/SpamAssassin rules

[qu...@apache.org]

Author: quinlan
Date: Wed Mar 17 14:06:01 2004
New Revision: 9573

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
   incubator/spamassassin/trunk/rules/70_testing.cf
Log:
try variation of HTML_WEB_BUGS instead since the other rules weren't good


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm	Wed Mar 17 14:06:01 2004
@@ -913,6 +913,11 @@
     {
       $self->{html}{web_bugs} = 1;
     }
+    if (exists $attr->{src} &&
+	$attr->{src} =~ /\.(?:pl|cgi|php|asp|jsp|cfm|\/$)\b/i)
+    {
+      $self->{html}{t_web_bugs} = 1;
+    }
   }
   if ($tag eq "form" && exists $attr->{action}) {
     $self->{html}{form_action_mailto} = 1 if $attr->{action} =~ /mailto:/i

Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf	(original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf	Wed Mar 17 14:06:01 2004
@@ -716,12 +716,7 @@
 describe T_RCVD_ILLEGAL_IP  Received contains illegal IP address
 
 # bug 2017
-rawbody T_IMG_ENDS_IN_SLASH /<img [^>]*src=[\"\']http:\/\/[^\"\'>]+\/[\"\']/i
-
-# Once is happenstance, twice is coincidence, the third time it's enemy action
-body T_HTML_IMG_ENDS_SLASH	eval:html_text('img_src', '=~ m{/$}')
-body T_HTML_WEB_BUGS		eval:html_text('img_src', '=~ /\.(?:pl|cgi|php|asp|jsp|cfm)\b/i')
-describe T_HTML_WEB_BUGS	Image tag intended to identify you
+body T_HTML_WEB_BUGS		eval:html_test('t_web_bugs')
 
 # revisit comment ratio
 body __HTML_COMMENT_RATIO_75	eval:html_range('total_comment_ratio','0.75','1.00')