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 2007/09/12 14:56:35 UTC

svn commit: r574932 - in /spamassassin/trunk/rules: 20_dnsbl_tests.cf 50_scores.cf

Author: jm
Date: Wed Sep 12 05:56:34 2007
New Revision: 574932

URL: http://svn.apache.org/viewvc?rev=574932&view=rev
Log:
bug 5476: update Bonded Sender (now Sender Score Certified) rules, and add a rule for their strictly-confirmed-opt-in-required zone

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

Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=574932&r1=574931&r2=574932&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Wed Sep 12 05:56:34 2007
@@ -189,25 +189,6 @@
 #reuse __DNS_FROM_RFC_WHOIS DNS_FROM_RFC_WHOIS
 
 # ---------------------------------------------------------------------------
-# 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-lastexternal', '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
-#reuse RCVD_IN_WHOIS_INVALID	RCVD_IN_RFC_IPWHOIS
-
-# ---------------------------------------------------------------------------
 # Now, single zone BLs follow:
 
 # DSBL catches open relays, badly-installed CGI scripts and open SOCKS and
@@ -270,18 +251,25 @@
 tflags RCVD_IN_MAPS_NML		net
 
 # ---------------------------------------------------------------------------
+# Section for DNS WL related lookups below.
 
-# Section for DNS WL related lookups below:
-
+# Sender Score Certified (formerly Bonded Sender, hence the legacy rule names):
+# http://www.senderscorecertified.com/ 
 header RCVD_IN_BSP_TRUSTED	eval:check_rbl_txt('bsp-firsttrusted', 'sa-trusted.bondedsender.org.', '(?i:bonded)')
-describe RCVD_IN_BSP_TRUSTED	Sender is in Bonded Sender Program (trusted relay)
+describe RCVD_IN_BSP_TRUSTED	Sender is in Sender Score Certified (trusted relay)
 tflags RCVD_IN_BSP_TRUSTED	net nice
 #reuse RCVD_IN_BSP_TRUSTED
 
 header RCVD_IN_BSP_OTHER	eval:check_rbl_txt('bsp-untrusted', 'sa-other.bondedsender.org.', '(?i:bonded)')
-describe RCVD_IN_BSP_OTHER	Sender is in Bonded Sender Program (other relay)
+describe RCVD_IN_BSP_OTHER	Sender is in Sender Score Certified (other relay)
 tflags RCVD_IN_BSP_OTHER	net nice
 #reuse RCVD_IN_BSP_OTHER
+
+# confirmed-opt-in list; see bug 5476
+header RCVD_IN_SSC_TRUSTED_COI    eval:check_rbl('ssc-firsttrusted', 'plus.bondedsender.org.')
+describe RCVD_IN_SSC_TRUSTED_COI  Sender is in Sender Score Certified (confirmed opt-in)
+tflags RCVD_IN_SSC_TRUSTED_COI    net nice
+#reuse RCVD_IN_SSC_TRUSTED_COI
 
 # ---------------------------------------------------------------------------
 

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=574932&r1=574931&r2=574932&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed Sep 12 05:56:34 2007
@@ -694,8 +694,6 @@
 score RCVD_IN_SORBS_SOCKS 0 0.182 0 0.801 # n=0 n=2
 score RCVD_IN_SORBS_WEB 0 1.117 0 0.619 # n=0 n=2
 score RCVD_IN_SORBS_ZOMBIE 0 # n=0 n=1 n=2 n=3
-score RCVD_IN_WHOIS_BOGONS 0 # n=0 n=1 n=2 n=3
-score RCVD_IN_WHOIS_INVALID 0 1.199 0 0.400 # n=0 n=2
 score RCVD_IN_XBL 0 2.896 0 3.033 # n=0 n=2
 score RCVD_IN_PBL 0 0.509 0 0.905 # n=0 n=2
 score DNS_FROM_AHBL_RHSBL 0 2.025 0 0.692 # n=0 n=2
@@ -703,12 +701,15 @@
 score DNS_FROM_RFC_DSN 0 2.527 0 1.495 # n=0 n=2
 score DNS_FROM_SECURITYSAGE 0 0.127 0 0.001 # n=0 n=2
 score NO_DNS_FOR_FROM 0 1.407 0 1.496 # n=0 n=2
-score RCVD_IN_WHOIS_HIJACKED 0 1.000 0 1.000 # n=2
 # </gen:mutable>
 
-# Bonded Sender: http://www.bondedsender.com/ 
+# Sender Score Certified (formerly Bonded Sender):
+# http://www.senderscorecertified.com/ .  See bug 5476.
+# note: RCVD_IN_SSC_TRUSTED_COI-listed IPs are also in RCVD_IN_BSP_TRUSTED,
+# hence score is additive (-4.3 + -3.7 = -8.0)
 score RCVD_IN_BSP_OTHER 0 -0.1 0 -0.1
 score RCVD_IN_BSP_TRUSTED 0 -4.3 0 -4.3
+score RCVD_IN_SSC_TRUSTED_COI 0 -3.7 0 -3.7
 
 # Habeas: http://www.habeas.com/
 score HABEAS_ACCREDITED_COI 0 -8.0 0 -8.0