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 2005/01/16 11:03:50 UTC

svn commit: r125351 - /spamassassin/trunk/rules/20_dnsbl_tests.cf /spamassassin/trunk/rules/50_scores.cf /spamassassin/trunk/rules/70_testing.cf

Author: quinlan
Date: Sun Jan 16 02:03:48 2005
New Revision: 125351

URL: http://svn.apache.org/viewcvs?view=rev&rev=125351
Log:
bug 3916: replace RCVD_IN_RFC_IPWHOIS with RCVD_IN_WHOIS_*

Modified:
   spamassassin/trunk/rules/20_dnsbl_tests.cf
   spamassassin/trunk/rules/50_scores.cf
   spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=125351&p1=spamassassin/trunk/rules/20_dnsbl_tests.cf&r1=125350&p2=spamassassin/trunk/rules/20_dnsbl_tests.cf&r2=125351
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf	(original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf	Sun Jan 16 02:03:48 2005
@@ -161,6 +161,24 @@
 tflags DNS_FROM_RFC_BOGUSMX	net
 
 # ---------------------------------------------------------------------------
+# CompleteWhois blacklists
+
+header __RCVD_IN_WHOIS		eval:check_rbl('whois', 'combined-HIB.dnsiplists.completewhois.com.')
+tflags __RCVD_IN_WHOIS		net
+
+header RCVD_IN_WHOIS_BOGONS	eval:check_rbl_sub('whois', '127.0.0.2')
+describe RCVD_IN_WHOIS_BOGONS	CompleteWhois: sender on bogons IP block
+tflags RCVD_IN_WHOIS_BOGONS	net
+
+header RCVD_IN_WHOIS_HIJACKED	eval:check_rbl_sub('whois', '127.0.0.3')
+describe RCVD_IN_WHOIS_HIJACKED	CompleteWhois: sender on hijacked IP block
+tflags RCVD_IN_WHOIS_HIJACKED	net
+
+header RCVD_IN_WHOIS_INVALID	eval:check_rbl('whois-notfirsthop', 'combined-HIB.dnsiplists.completewhois.com.', '127.0.0.4')
+describe RCVD_IN_WHOIS_INVALID	CompleteWhois: sender on invalid IP block
+tflags RCVD_IN_WHOIS_INVALID	net
+
+# ---------------------------------------------------------------------------
 # Now, single zone BLs follow:
 
 # DSBL catches open relays, badly-installed CGI scripts and open SOCKS and

Modified: spamassassin/trunk/rules/50_scores.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/50_scores.cf?view=diff&rev=125351&p1=spamassassin/trunk/rules/50_scores.cf&r1=125350&p2=spamassassin/trunk/rules/50_scores.cf&r2=125351
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf	(original)
+++ spamassassin/trunk/rules/50_scores.cf	Sun Jan 16 02:03:48 2005
@@ -452,7 +452,6 @@
 score RCVD_IN_NJABL_PROXY 0 1.026 0 0.438
 score RCVD_IN_NJABL_RELAY 0 0.934 0 1.397
 score RCVD_IN_NJABL_SPAM 0 1.051 0 1.841
-score RCVD_IN_RFC_IPWHOIS 0 1.140 0 1.664
 score RCVD_IN_RSL 0 0.677 0 1.720
 score RCVD_IN_SBL 0 1.050 0 0.107
 score RCVD_IN_SORBS_BLOCK 0
@@ -463,6 +462,8 @@
 score RCVD_IN_SORBS_SOCKS 0 1.847 0 2.054
 score RCVD_IN_SORBS_WEB 0 0 0 0.007
 score RCVD_IN_SORBS_ZOMBIE 0 0.819 0 0
+score RCVD_IN_WHOIS_BOGONS 0 1.5 0 2.0
+score RCVD_IN_WHOIS_INVALID 0 1.0 0 1.5
 score RCVD_IN_XBL 0 2.511 0 3.076
 score RCVD_NUMERIC_HELO 0.636 1.531 1.348 1.248
 score RECEIVE_OFFER 1.125 0.955 1.446 0.793
@@ -604,6 +605,9 @@
 # Habeas: http://www.habeas.com/
 score HABEAS_INFRINGER 0 16.0 0 16.0
 score HABEAS_USER 0 -8.0 0 -8.0
+
+# CompleteWhois: http://www.completewhois.com/
+score RCVD_IN_WHOIS_HIJACKED 0 1.0 0 1.0
 
 # SenderBase -- experimental
 score __SENDERBASE 0

Modified: spamassassin/trunk/rules/70_testing.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev=125351&p1=spamassassin/trunk/rules/70_testing.cf&r1=125350&p2=spamassassin/trunk/rules/70_testing.cf&r2=125351
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf	(original)
+++ spamassassin/trunk/rules/70_testing.cf	Sun Jan 16 02:03:48 2005
@@ -472,34 +472,6 @@
 rawbody T_HTML_FONT_SIZE_0PX	/<font\b[^>]+0px/i
 rawbody T_HTML_FONT_COLOR_WHITE	/<font\b[^>]+white/i
 
-# bug 3916
-header __RCVD_IN_WHOIS		eval:check_rbl('whois', 'combined-HIB.dnsiplists.completewhois.com.')
-tflags __RCVD_IN_WHOIS		net
-
-header T_RCVD_IN_WHOIS_BOGONS	eval:check_rbl_sub('whois', '127.0.0.2')
-describe T_RCVD_IN_WHOIS_BOGONS	CompleteWhois: sender on bogons IP block
-tflags T_RCVD_IN_WHOIS_BOGONS	net
-
-header T_RCVD_IN_WHOIS_HIJACKED	eval:check_rbl_sub('whois', '127.0.0.3')
-describe T_RCVD_IN_WHOIS_HIJACKED	CompleteWhois: sender on hijacked IP block
-tflags T_RCVD_IN_WHOIS_HIJACKED	net
-
-header T_RCVD_IN_WHOIS_INVALID	eval:check_rbl_sub('whois', '127.0.0.4')
-describe T_RCVD_IN_WHOIS_INVALID	CompleteWhois: sender on invalid whois IP block
-tflags T_RCVD_IN_WHOIS_INVALID	net
-
-header T_RCVD_IN_WHOIS_BOGONS_NFH	eval:check_rbl('whois-notfirsthop', 'combined-HIB.dnsiplists.completewhois.com.', '127.0.0.2')
-describe T_RCVD_IN_WHOIS_BOGONS_NFH	CompleteWhois: sender on bogons IP block
-tflags T_RCVD_IN_WHOIS_BOGONS_NFH	net
-
-header T_RCVD_IN_WHOIS_HIJACKED_NFH	eval:check_rbl('whois-notfirsthop', 'combined-HIB.dnsiplists.completewhois.com.', '127.0.0.3')
-describe T_RCVD_IN_WHOIS_HIJACKED_NFH	CompleteWhois: sender on hijacked IP block
-tflags T_RCVD_IN_WHOIS_HIJACKED_NFH	net
-
-header T_RCVD_IN_WHOIS_INVALID_NFH	eval:check_rbl('whois-notfirsthop', 'combined-HIB.dnsiplists.completewhois.com.', '127.0.0.4')
-describe T_RCVD_IN_WHOIS_INVALID_NFH	CompleteWhois: sender on invalid whois IP block
-tflags T_RCVD_IN_WHOIS_INVALID_NFH	net
-
 ########################################################################
 
 # case matters for this one