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/11/17 18:02:47 UTC
svn commit: r476217 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf
Author: jm
Date: Fri Nov 17 09:02:46 2006
New Revision: 476217
URL: http://svn.apache.org/viewvc?view=rev&rev=476217
Log:
amend JM_TORA_XM to hopefully avoid some FPs
Modified:
spamassassin/rules/trunk/sandbox/jm/20_basic.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=476217&r1=476216&r2=476217
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Fri Nov 17 09:02:46 2006
@@ -147,6 +147,15 @@
meta DYN_RDNS_SHORT_HELO_IMAGE (__HELO_NO_DOMAIN && RDNS_DYNAMIC && __ANY_IMAGE_ATTACH)
describe DYN_RDNS_SHORT_HELO_IMAGE Short HELO string, dynamic rDNS, inline image
+header __HDR_ORDER_FTSDMCXXXX ALL =~ /\nFrom: .{1,80}?\nTo: .{1,80}?\nSubject: .{1,200}?\nDate: .{1,40}?\nMIME-Version: .{1,40}?\nContent-Type: .{1,120}?\nX-Priority: .{1,40}?\nX-MSMail-Priority: .{1,40}?\nX-Mailer: .{1,80}?\nX-MimeOLE:/s
+header __MID_START_001C Message-ID =~ /^<000001c/
+
+meta HDR_ORDER_FTSDMCXX_BAT (__HDR_ORDER_FTSDMCXXXX && __BAT_BOUNDARY)
+describe HDR_ORDER_FTSDMCXX_BAT Header order similar to spam (FTSDMCXX/boundary variant)
+
+meta HDR_ORDER_FTSDMCXX_001C (__HDR_ORDER_FTSDMCXXXX && __MID_START_001C)
+describe HDR_ORDER_FTSDMCXX_001C Header order similar to spam (FTSDMCXX/MID variant)
+
# ---------------------------------------------------------------------------
# Testing bit
@@ -161,13 +170,6 @@
meta STOCK_IMG_CTYPE (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__CTYPE_ONETAB_GIF&&__HTML_IMG_ONLY)
describe STOCK_IMG_CTYPE Stock spam image part, with distinctive Content-Type header
-header __HDR_ORDER_FTSDMCXXXX ALL =~ /\nFrom: .{1,80}?\nTo: .{1,80}?\nSubject: .{1,200}?\nDate: .{1,40}?\nMIME-Version: .{1,40}?\nContent-Type: .{1,120}?\nX-Priority: .{1,40}?\nX-MSMail-Priority: .{1,40}?\nX-Mailer: .{1,80}?\nX-MimeOLE:/s
-header __MID_START_001C Message-ID =~ /^<000001c/
-meta HDR_ORDER_FTSDMCXX (__HDR_ORDER_FTSDMCXXXX && !__MIME_ATTACHMENT)
-meta HDR_ORDER_FTSDMCXX2 (__HDR_ORDER_FTSDMCXXXX && __BAT_BOUNDARY)
-meta HDR_ORDER_FTSDMCXX3 (__HDR_ORDER_FTSDMCXXXX && __MID_START_001C)
-# describe HDR_ORDER_FTSDMCXX Header order is similar to spam (FTSDMCXX variant)
-
uri __HAS_ANY_URI /./
body __HAS_ANY_EMAIL /\w@\S+\.\w/
meta SB_GIF_AND_NO_URIS (__ANY_IMAGE_ATTACH&&!__HAS_ANY_URI&&!__HAS_ANY_EMAIL)
@@ -192,8 +194,9 @@
# compare with AXB_FAKETZ, GMD_FAKETZ
header L_SPAM_TOOL_13 Date =~ /\s[+-]\d(?![2358]45)\d[124-9]\d$/
-header __MAILER_OL_5510 X-Mailer =~ /^Microsoft Office Outlook, Build 11.0.5510$/
+header __MAILER_OL_6626 X-Mailer =~ /^Microsoft Outlook, Build 10\.0\.6626$/
header __MOLE_2962 X-MimeOLE =~ /^Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2900\.2962$/
-meta JM_TORA_XM (__MAILER_OL_5510 && __MOLE_2962)
+header __NAKED_TO To =~ /^[^\s<>]+\@[^\s<>]+$/
+meta JM_TORA_XM (__MAILER_OL_6626 && __MOLE_2962 && __NAKED_TO)