You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/10/14 11:29:50 UTC
svn commit: r463906 - in /spamassassin/rules/trunk/sandbox/jm: 20_basic.cf
20_sendmailid.cf
Author: jm
Date: Sat Oct 14 02:29:49 2006
New Revision: 463906
URL: http://svn.apache.org/viewvc?view=rev&rev=463906
Log:
more refinement against GIF spam
Modified:
spamassassin/rules/trunk/sandbox/jm/20_basic.cf
spamassassin/rules/trunk/sandbox/jm/20_sendmailid.cf
Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=463906&r1=463905&r2=463906
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Sat Oct 14 02:29:49 2006
@@ -60,24 +60,27 @@
ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-mimeheader PART_CID_STOCK Content-ID =~ /^<[a-f0-9]{12}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[^\s\.]+>$/
-describe PART_CID_STOCK Contains a spammy image attachment (by Content-ID)
+mimeheader __PART_STOCK_CID Content-ID =~ /^<[a-f0-9]{12}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[^\s\.]+>$/
+mimeheader __PART_STOCK_GIF Content-Type =~ /image\/gif/
+mimeheader __PART_STOCK_JPEG Content-Type =~ /image\/jpeg/
+mimeheader __PART_STOCK_PNG Content-Type =~ /image\/png/
+mimeheader __PART_STOCK_CL Content-Location =~ /./
+mimeheader __PART_STOCK_CD_F Content-Disposition =~ /filename/
-mimeheader __PART_CID_STOCK_GIF Content-Type =~ /image\/gif/
-mimeheader __PART_CID_STOCK_JPEG Content-Type =~ /image\/jpeg/
-mimeheader __PART_CID_STOCK_CL Content-Location =~ /./
-mimeheader __PART_CID_STOCK_CD_F Content-Disposition =~ /filename/
-
-meta PART_CID_STOCK_5 (__PART_CID_STOCK_GIF&&PART_CID_STOCK)
-meta PART_CID_STOCK_6 (__PART_CID_STOCK_JPEG&&PART_CID_STOCK)
-meta PART_CID_STOCK_5A (__PART_CID_STOCK_GIF&&PART_CID_STOCK&&!__PART_CID_STOCK_CL&&!__PART_CID_STOCK_CD_F)
-meta PART_CID_STOCK_6A (__PART_CID_STOCK_JPEG&&PART_CID_STOCK&&!__PART_CID_STOCK_CL&&!__PART_CID_STOCK_CD_F)
-
-
-# not so useful:
-mimeheader PART_CID_STOCK_LESS Content-ID =~ /^<00[a-f0-9]{10}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[A-Za-z]+>$/
-meta PART_CID_STOCK_3 (__PART_CID_STOCK_GIF&&PART_CID_STOCK_LESS)
-meta PART_CID_STOCK_4 (__PART_CID_STOCK_JPEG&&PART_CID_STOCK_LESS)
+meta PART_CID_STOCK ((__PART_STOCK_GIF||__PART_STOCK_JPEG)&&__PART_STOCK_CID&&!__PART_STOCK_CL&&!__PART_STOCK_CD_F)
+describe PART_CID_STOCK Has a spammy image attachment (by Content-ID)
+
+meta PART_CID_STOCK_PNG ((__PART_STOCK_GIF||__PART_STOCK_JPEG||__PART_STOCK_PNG)&&__PART_STOCK_CID&&!__PART_STOCK_CL&&!__PART_STOCK_CD_F)
+
+
+# more specific, 0 ham hits
+mimeheader __PART_CID_STOCK_LESS Content-ID =~ /^<00[a-f0-9]{10}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[A-Za-z]+>$/
+meta PART_CID_STOCK_LESS ((__PART_STOCK_GIF||__PART_STOCK_JPEG)&&__PART_CID_STOCK_LESS)
+describe PART_CID_STOCK_LESS Has a spammy image attachment (by Content-ID, more specific)
+
+meta PART_CID_STOCK_LESS_PNG ((__PART_STOCK_GIF||__PART_STOCK_JPEG||__PART_STOCK_PNG)&&__PART_CID_STOCK_LESS)
+
+mimeheader CTYPE_1SPACE_GIF Content-Type:raw =~ /image\/gif;\n name=\".+?\"\s*$/s
endif # Mail::SpamAssassin::Plugin::MIMEHeader
Modified: spamassassin/rules/trunk/sandbox/jm/20_sendmailid.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_sendmailid.cf?view=diff&rev=463906&r1=463905&r2=463906
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_sendmailid.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_sendmailid.cf Sat Oct 14 02:29:49 2006
@@ -6,7 +6,3 @@
header JM_RCVD_SENDMAILID eval:check_sendmail_id()
endif
-header JM_RCVD_QMAILV1 Received =~ /by \S+ \(Qmailv1\) with ESMTP/
-
-header JM_LC_MID ALL =~ /\nmessage-id: /s
-