You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/05/05 08:19:46 UTC

svn commit: rev 10529 - incubator/spamassassin/trunk/rules

Author: quinlan
Date: Tue May  4 23:19:45 2004
New Revision: 10529

Modified:
   incubator/spamassassin/trunk/rules/20_head_tests.cf
   incubator/spamassassin/trunk/rules/20_meta_tests.cf
   incubator/spamassassin/trunk/rules/20_ratware.cf
   incubator/spamassassin/trunk/rules/70_testing.cf
Log:
bunch of rule stuff


Modified: incubator/spamassassin/trunk/rules/20_head_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_head_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_head_tests.cf	Tue May  4 23:19:45 2004
@@ -217,6 +217,9 @@
 header DATE_IN_FUTURE_96_XX	eval:check_for_shifted_date('96', 'undef')
 describe DATE_IN_FUTURE_96_XX	Date: is 96 hours or more after Received: date
 
+header DATE_TEMPLATE		ALL =~ /%CURRENT_DATE_TIME/
+describe DATE_TEMPLATE		Headers contain an unresolved date template
+
 ###########################################################################
 # illegal characters that should be MIME encoded
 # might want to exempt users using languages that don't use Latin
@@ -289,6 +292,9 @@
 header RCVD_NUMERIC_HELO	eval:check_for_numeric_helo()
 describe RCVD_NUMERIC_HELO	Received: contains an IP address used for HELO
 
+header RCVD_ILLEGAL_IP		eval:check_for_illegal_ip()
+describe RCVD_ILLEGAL_IP	Received: contains illegal IP address
+
 # no legit mailer claims that their mailserver has no name
 # overlaps with RCVD_DOUBLE_IP*, but let's see how it is scored
 header RCVD_BY_IP	Received =~ /\bby\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?<!127\.0\.0\.1)\b/
@@ -693,7 +699,7 @@
 header NO_RDNS_DOTCOM_HELO	eval:check_for_no_rdns_dotcom_helo()
 describe NO_RDNS_DOTCOM_HELO	Host HELO'd as a big ISP, but had no rDNS
 
-header X_ORIG_IP_NOT_IPV4	X-Originating-IP !~ /\[?(?:\d{1,3}\.){3}\d{1,3}\]?/ [if-unset: 0.0.0.0] 
+header X_ORIG_IP_NOT_IPV4	X-Originating-IP !~ /\[?(?:\d{1,3}\.){3}\d{1,3}\]?/ [if-unset: 0.0.0.0]
 describe X_ORIG_IP_NOT_IPV4	X-Originating-IP doesn't look like IPv4 address
 
 # match the format of a legit X-Auth-Warning header, and hit on fake ones

Modified: incubator/spamassassin/trunk/rules/20_meta_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_meta_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_meta_tests.cf	Tue May  4 23:19:45 2004
@@ -143,3 +143,7 @@
 meta BUGGY_CGI			(__BUGGY_CGI && !__NMS_CGI_NOT_BUGGY)
 describe BUGGY_CGI		Broken CGI script message
 
+header __PC_RND_HEADER		ALL =~ /%RA?ND(?:OM)?_[A-Z]/i
+body __PC_RND_BODY		/%RA?ND(?:OM)?_[A-Z]/i
+rawbody __PC_RND_RAWBODY	/%RA?ND(?:OM)?_[A-Z]/i
+meta PERCENT_RANDOM	(__PC_RND_HEADER || __PC_RND_BODY || __PC_RND_RAWBODY)

Modified: incubator/spamassassin/trunk/rules/20_ratware.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_ratware.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_ratware.cf	Tue May  4 23:19:45 2004
@@ -59,6 +59,8 @@
 describe RATWARE_DIFFOND	Bulk email fingerprint (DiffondiCool) found
 header RATWARE_RCVD_LC_ESMTP	Received =~ /^from (?:(?:unknown|\d+\.\d+\.\d+\.\d+) \(\S+\)|\[\d+\.\d+\.\d+\.\d+\]) by \S+ with (?:esmtp|local|smtp); /m
 describe RATWARE_RCVD_LC_ESMTP	Bulk email fingerprint ('esmtp' Received) found
+header RATWARE_MOZ_MALFORMED	User-Agent =~ /Mozilla\/5\.0\d\d/
+describe RATWARE_MOZ_MALFORMED	Bulk email fingerprint (Mozilla malformed) found
 
 ###########################################################################
 # Now, detect forgeries of real MUAs

Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf	(original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf	Tue May  4 23:19:45 2004
@@ -67,35 +67,11 @@
 describe T_RCVD_IN_IADB_LIST_T	Sender is listed in ISIPP IADB
 tflags T_RCVD_IN_IADB_LIST_T	net nice
 
-# Bug 2168
-header T_BAD_MOZILLA_VERSION    User-Agent =~ /Mozilla\/5\.0\d\d/
-describe T_BAD_MOZILLA_VERSION  User-Agent claims to be Mozilla, but is malformed
-
-header T_RCVD_ILLEGAL_IP_1	Received =~ /[\s\(\[\:\=](?:(?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|127\.[1-9]\.\d+\.\d+|127\.0\.[1-9]\.\d+|127\.0\.0\.(?:\d\d+|[2-9]))\b/
-describe T_RCVD_ILLEGAL_IP_1	Received contains illegal IP address
-
-header T_RCVD_ILLEGAL_IP_2	eval:check_for_illegal_ip()
-describe T_RCVD_ILLEGAL_IP_2	Received contains illegal IP address
-
 # REIMPLEMENT: ADVERT_CODE tests.
 header T_ADVERT_CODE	Subject =~ /^[^0-9a-z]*adv(?:ert)?\b/i
 # may need a negative lookahead between in front of first \b for "ADV."
-header T_ADVERT_CODE2	Subject =~ /\w.*\bA\s*D\s*V\b/
-
-# bug 3262
-body T_NO_COST			/\bno (?:(?:extra|hidden) )?(?:cost|charge)\b/i
-
-# a couple to try out
-header T_PC_CUR_DATE_TIME_1	ALL =~ /%CURRENT_DATE_TIME/
-
-# RAND rules
-header __PC_RND_HEADER		ALL =~ /%RA?ND(?:OM)?_[A-Z]/i
-body __PC_RND_BODY		/%RA?ND(?:OM)?_[A-Z]/i
-rawbody __PC_RND_RAWBODY	/%RA?ND(?:OM)?_[A-Z]/i
-meta T_PERCENT_RANDOM_1	(__PC_RND_HEADER || __PC_RND_BODY || __PC_RND_RAWBODY)
-meta T_PERCENT_RANDOM_2	(__PC_RND_HEADER || __PC_RND_BODY)
-meta T_PERCENT_RANDOM_3	(__PC_RND_HEADER || __PC_RND_RAWBODY)
-meta T_PERCENT_RANDOM_4	(__PC_RND_BODY || __PC_RND_RAWBODY)
+header T_ADVERT_CODE2A	Subject =~ /\w.*\bA\s*D\s*V\b/
+header T_ADVERT_CODE2B	Subject =~ /\w.*\b(?!ADV\.)A\s*D\s*V\b/
 
 # Matt Kettler's antidrug.cf ruleset.  bug 3009
 # should probably move good ones from here directly into 20_drugs.cf?
@@ -762,9 +738,34 @@
 
 ########################################################################
 
-# let's see how this works
-meta T_SPF_PASS_NO_SBL          (SPF_PASS && !RCVD_IN_SBL)
-meta T_SPF_HELO_PASS_NO_SBL     (SPF_HELO_PASS && !RCVD_IN_SBL)
-tflags T_SPF_PASS_NO_SBL        net nice
-tflags T_SPF_HELO_PASS_NO_SBL   net nice
+# HELO hits we're losing due to bug fix in SPF module
+header __HELO_ONE_WORD_1_A	X-Spam-Relays-Untrusted =~ / helo=[^.]+(?:\s|$)/
+header __HELO_ONE_WORD_2_A	X-Spam-Relays-Trusted =~ / helo=[^.]+(?:\s|$)/
+meta HELO_ONE_WORD_A		(__HELO_ONE_WORD_1_A || __HELO_ONE_WORD_2_A)
+
+header __HELO_ONE_WORD_1_B	X-Spam-Relays-Untrusted !~ /helo=[^.]+\.[^.]+/ [if-unset: helo=foo.bar]
+header __HELO_ONE_WORD_2_B	X-Spam-Relays-Trusted !~ /helo=[^.]+\.[^.]+/ [if-unset: helo=foo.bar]
+meta HELO_ONE_WORD_B		(__HELO_ONE_WORD_1_B || __HELO_ONE_WORD_2_B)
 
+# let's see how this works
+meta T_SPF_PASS_NO_SBL		(SPF_PASS && !RCVD_IN_SBL)
+meta T_SPF_HELO_PASS_NO_SBL	(SPF_HELO_PASS && !RCVD_IN_SBL)
+tflags T_SPF_PASS_NO_SBL	net nice
+tflags T_SPF_HELO_PASS_NO_SBL	net nice
+
+# long-term test
+# IP-based volume and date of first email might be better considering
+# that SBL is a domain blacklist, but this is a start
+header __SENDERBASE_VOL_SPIKE	eval:check_rbl_sub('senderbase', 'S23 > S24 + 1')
+header __SENDERBASE_45_DAYS	eval:check_rbl_sub('senderbase', '(time - S25 > 45*86400)')
+header __SENDERBASE_90_DAYS	eval:check_rbl_sub('senderbase', '(time - S25 > 90*86400)')
+header __SENDERBASE_180_DAYS	eval:check_rbl_sub('senderbase', '(time - S25 > 180*86400)')
+header __SENDERBASE_360_DAYS	eval:check_rbl_sub('senderbase', '(time - S25 > 360*86400)')
+meta T_SPF_PASS_NO_SBL_45D	(SPF_PASS && !RCVD_IN_SBL && !__SENDERBASE_VOL_SPIKE && __SENDERBASE_45_DAYS)
+meta T_SPF_PASS_NO_SBL_90D	(SPF_PASS && !RCVD_IN_SBL && !__SENDERBASE_VOL_SPIKE && __SENDERBASE_90_DAYS)
+meta T_SPF_PASS_NO_SBL_180D	(SPF_PASS && !RCVD_IN_SBL && !__SENDERBASE_VOL_SPIKE && __SENDERBASE_180_DAYS)
+meta T_SPF_PASS_NO_SBL_360D	(SPF_PASS && !RCVD_IN_SBL && !__SENDERBASE_VOL_SPIKE && __SENDERBASE_360_DAYS)
+tflags T_SPF_PASS_NO_SBL_45D net nice
+tflags T_SPF_PASS_NO_SBL_90D net nice
+tflags T_SPF_PASS_NO_SBL_180D net nice
+tflags T_SPF_PASS_NO_SBL_360D net nice