You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by wt...@apache.org on 2009/12/16 23:36:28 UTC
svn commit: r891460 - in /spamassassin/trunk: rules/20_dnsbl_tests.cf
rules/50_scores.cf rulesrc/10_force_active.cf
rulesrc/sandbox/wtogami/20_rp_certified.cf
Author: wtogami
Date: Wed Dec 16 22:36:28 2009
New Revision: 891460
URL: http://svn.apache.org/viewvc?rev=891460&view=rev
Log:
Bug #6247: Replace HABEAS, BSP and SSC with RP CERTIFIED.
Note: CERTIFIED is cumulative with SAFE.
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=891460&r1=891459&r2=891460&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Wed Dec 16 22:36:28 2009
@@ -235,22 +235,6 @@
# ---------------------------------------------------------------------------
# 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 accredited by Return Path's Sender Score Certified program; report issues to senderscorecertified.com@abuse.net
-
-tflags RCVD_IN_BSP_TRUSTED net nice
-reuse RCVD_IN_BSP_TRUSTED
-
-# 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 accredited by Return Path's Sender Score Certified (confirmed opt-in)
-tflags RCVD_IN_SSC_TRUSTED_COI net nice
-reuse RCVD_IN_SSC_TRUSTED_COI
-
-# ---------------------------------------------------------------------------
-
# IADB support ...
header __RCVD_IN_IADB eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.')
tflags __RCVD_IN_IADB net nice
@@ -259,37 +243,4 @@
describe RCVD_IN_IADB_VOUCHED ISIPP IADB lists as vouched-for sender
tflags RCVD_IN_IADB_VOUCHED net nice
-# ---------------------------------------------------------------------------
-
-# Habeas Accredited Senders
-# Last octet of the returned A record indicates the Habeas-assigned
-# "Permission Level" of the Sender.
-# 10 to 39 Personal, transactional, and Confirmed Opt In
-# 40 to 59 Secure referrals and Single Opt In
-# 60 to 99 Checked but not accredited by Habeas.
-#
-# sa-accredit.habeas.com is for SpamAssassin use.
-#
-header HABEAS_ACCREDITED_COI eval:check_rbl('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d')
-describe HABEAS_ACCREDITED_COI Sender is accredited by Return Path's Sender Score Safelist program, and uses Confirmed Opt-In; report issues to habeas.com@abuse.net
-tflags HABEAS_ACCREDITED_COI net nice
-
-header HABEAS_ACCREDITED_SOI eval:check_rbl_sub('habeas-firsttrusted', '127\.\d+\.\d+\.[45]\d')
-describe HABEAS_ACCREDITED_SOI Sender is accredited by Return Path's Sender Score Safelist program, and uses Opt-In or better; report issues to habeas.com@abuse.net
-tflags HABEAS_ACCREDITED_SOI net nice
-
-# Habeas Accredited Senders, with check for "Accreditor Assertion"
-# Same Habeas whitelist checks as above, but performed only if the Sender
-# has specified Habeas as their accreditor in either the EnvelopeFrom or
-# "Accreditor" header field. This reduces the DNS overhead, but will
-# miss senders who are unable to add custom header fields.
-#
-# header HABEAS_ACCREDITED_COI eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d', 'habeas')
-# describe HABEAS_ACCREDITED_COI Habeas Accredited Confirmed Opt-In or Better
-# tflags HABEAS_ACCREDITED_COI net nice
-#
-# header HABEAS_ACCREDITED_SOI eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[45]\d', 'habeas')
-# describe HABEAS_ACCREDITED_SOI Habeas Accredited Opt-In or Better
-# tflags HABEAS_ACCREDITED_SOI net nice
-#
endif
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=891460&r1=891459&r2=891460&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed Dec 16 22:36:28 2009
@@ -756,16 +756,12 @@
score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
# </gen:mutable>
-# 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_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
-score HABEAS_ACCREDITED_SOI 0 -4.3 0 -4.3
+# ReturnPath Certified
+# http://www.returnpath.net/internetserviceprovider/certification/
+# CERTIFIED is a subset of SAFE, thus the score is cumulative.
+# -2 + -3 = -5 points for CERTIFIED
+score RCVD_IN_RP_CERTIFIED 0.0 -3.0 0.0 -3.0
+score RCVD_IN_RP_SAFE 0.0 -2.0 0.0 -2.0
# DNSWL
score RCVD_IN_DNSWL_NONE 0 -0.0001 0 -0.0001
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=891460&r1=891459&r2=891460&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Wed Dec 16 22:36:28 2009
@@ -420,8 +420,6 @@
publish GEO_QUERY_STRING
publish GTUBE
publish GUARANTEED_100_PERCENT
-publish HABEAS_ACCREDITED_COI
-publish HABEAS_ACCREDITED_SOI
publish HASHCASH_20
publish HASHCASH_21
publish HASHCASH_22
@@ -670,7 +668,6 @@
publish RCVD_ILLEGAL_IP
publish RCVD_IN_BL_SPAMCOP_NET
publish RCVD_IN_BRBL_LASTEXT
-publish RCVD_IN_BSP_TRUSTED
publish RCVD_IN_DNSWL_HI
publish RCVD_IN_DNSWL_LOW
publish RCVD_IN_DNSWL_MED
@@ -715,7 +712,9 @@
publish RCVD_IN_NJABL_SPAM
publish RCVD_IN_PBL
publish RCVD_IN_PSBL
+publish RCVD_IN_RP_CERTIFIED
publish RCVD_IN_RP_RNBL
+publish RCVD_IN_RP_SAFE
publish RCVD_IN_SBL
publish RCVD_IN_SORBS_BLOCK
publish RCVD_IN_SORBS_DUL
@@ -725,7 +724,6 @@
publish RCVD_IN_SORBS_SOCKS
publish RCVD_IN_SORBS_WEB
publish RCVD_IN_SORBS_ZOMBIE
-publish RCVD_IN_SSC_TRUSTED_COI
publish RCVD_IN_XBL
publish RCVD_MAIL_COM
publish RCVD_NUMERIC_HELO
Modified: spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf?rev=891460&r1=891459&r2=891460&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/wtogami/20_rp_certified.cf Wed Dec 16 22:36:28 2009
@@ -6,14 +6,14 @@
# (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI)
header RCVD_IN_RP_CERTIFIED eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
describe RCVD_IN_RP_CERTIFIED Sender is in Return Path Certified (trusted relay)
-tflags RCVD_IN_RP_CERTIFIED net nice nopublish
+tflags RCVD_IN_RP_CERTIFIED net nice
# Return Path Safe:
# http://www.returnpath.net/internetserviceprovider/certification/
# (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED)
header RCVD_IN_RP_SAFE eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
describe RCVD_IN_RP_SAFE Sender is in Return Path Safe (trusted relay)
-tflags RCVD_IN_RP_SAFE net nice nopublish
+tflags RCVD_IN_RP_SAFE net nice
# Return Path Reputation Network Blacklist (RNBL):
# https://senderscore.org/blacklistlookup/