You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kb...@apache.org on 2011/12/14 17:54:49 UTC
svn commit: r1214333 - in /spamassassin/trunk: rules/25_uribl.cf
rules/50_scores.cf rulesrc/10_force_active.cf
rulesrc/sandbox/felicity/70_dnswl.cf
Author: kb
Date: Wed Dec 14 16:54:48 2011
New Revision: 1214333
URL: http://svn.apache.org/viewvc?rev=1214333&view=rev
Log:
Bug 6724. Implemented RCVD_IN_DNSWL_BLOCKED rule. Also some minor fixes to
URIBL rules.
Modified:
spamassassin/trunk/rules/25_uribl.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/rulesrc/sandbox/felicity/70_dnswl.cf
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1214333&r1=1214332&r2=1214333&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Wed Dec 14 16:54:48 2011
@@ -122,8 +122,9 @@ reuse URIBL_RED
#URIBL BLOCK RULES - Bit 1 means your DNS has been blocked and this rule should be triggered to notify you.
urirhssub URIBL_BLOCKED multi.uribl.com. A 1
body URIBL_BLOCKED eval:check_uridnsbl('URIBL_BLOCKED')
-describe URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information.
+describe URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information.
tflags URIBL_BLOCKED nice net noautolearn
+reuse URIBL_BLOCKED
###########################################################################
## DOMAINS TO SKIP (KNOWN GOOD)
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1214333&r1=1214332&r2=1214333&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed Dec 14 16:54:48 2011
@@ -763,16 +763,14 @@ score RCVD_IN_RP_SAFE 0.0 -2.0 0.0 -2.0
#score RCVD_IN_DNSWL_LOW 0 -0.7 0 -0.7
#score RCVD_IN_DNSWL_MED 0 -2.3 0 -2.3
#score RCVD_IN_DNSWL_HI 0 -5 0 -5
+#score RCVD_IN_DNSWL_BLOCKED 0 0.001 0 0.001
#BUG 6718 TO DISABLE DNSWL BY DEFAULT DUE TO FPs ON THEIR NAMESERVERS
score RCVD_IN_DNSWL_NONE 0
score RCVD_IN_DNSWL_LOW 0
score RCVD_IN_DNSWL_MED 0
score RCVD_IN_DNSWL_HI 0
-
-#BUG 6724 TO ENABLE BLOCK NOTICES FOR BLs
-#score RCVD_IN_DNSWL_BLOCKED 0.001
-score URIBL_BLOCKED 0.001
+score RCVD_IN_DNSWL_BLOCKED 0
# IADB
score RCVD_IN_IADB_VOUCHED 0 -2.2 0 -2.2
@@ -1034,7 +1032,8 @@ score URIBL_DBL_SPAM 0 1.7 0 1.7
score URIBL_DBL_REDIR 0 0.001 0 0.001
# </gen:mutable>
# score URIBL_GREY 0.25
-score URIBL_RED 0.001
+score URIBL_RED 0 0.001 0 0.001
+score URIBL_BLOCKED 0 0.001 0 0.001
score URIBL_DBL_ERROR 0 0.001 0 0.001
endif # Mail::SpamAssassin::Plugin::URIDNSBL
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1214333&r1=1214332&r2=1214333&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Wed Dec 14 16:54:48 2011
@@ -660,6 +660,7 @@ publish RCVD_IN_DNSWL_HI
publish RCVD_IN_DNSWL_LOW
publish RCVD_IN_DNSWL_MED
publish RCVD_IN_DNSWL_NONE
+publish RCVD_IN_DNSWL_BLOCKED
publish RCVD_IN_IADB_DK
publish RCVD_IN_IADB_DOPTIN
publish RCVD_IN_IADB_DOPTIN_GT50
@@ -840,6 +841,7 @@ publish UPPERCASE_75_100
publish URG_BIZ
publish URIBL_AB_SURBL
publish URIBL_BLACK
+publish URIBL_BLOCKED
publish URIBL_GREY
publish URIBL_JP_SURBL
publish URIBL_OB_SURBL
Modified: spamassassin/trunk/rulesrc/sandbox/felicity/70_dnswl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/felicity/70_dnswl.cf?rev=1214333&r1=1214332&r2=1214333&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/felicity/70_dnswl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/felicity/70_dnswl.cf Wed Dec 14 16:54:48 2011
@@ -58,8 +58,9 @@ reuse RCVD_IN_DNSWL_HI
## score RCVD_IN_DNSWL_MED -4
## score RCVD_IN_DNSWL_HI -8
-#reuse RCVD_IN_DNSWL_LOW
-#reuse RCVD_IN_DNSWL_MED
-#reuse RCVD_IN_DNSWL_HI
+header RCVD_IN_DNSWL_BLOCKED eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.255$')
+describe RCVD_IN_DNSWL_BLOCKED ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information.
+tflags RCVD_IN_DNSWL_BLOCKED nice net noautolearn
+reuse RCVD_IN_DNSWL_BLOCKED
endif