You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/10/08 12:38:41 UTC
svn commit: r1868136 - in /spamassassin/trunk/rules: 20_dnsbl_tests.cf
25_uribl.cf 50_scores.cf
Author: hege
Date: Tue Oct 8 12:38:41 2019
New Revision: 1868136
URL: http://svn.apache.org/viewvc?rev=1868136&view=rev
Log:
Bug 7757 - Spamhaus zones and new return codes
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/25_uribl.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=1868136&r1=1868135&r2=1868136&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Tue Oct 8 12:38:41 2019
@@ -132,6 +132,24 @@ describe RCVD_IN_SBL_CSS Received via a
tflags RCVD_IN_SBL_CSS net
reuse RCVD_IN_SBL_CSS
+# New blocked checks 10/2019
+header RCVD_IN_ZEN_BLOCKED_OPENDNS eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.255\.255\.254$')
+describe RCVD_IN_ZEN_BLOCKED_OPENDNS ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked due to usage of an open resolver. See https://www.spamhaus.org/returnc/pub/
+tflags RCVD_IN_ZEN_BLOCKED_OPENDNS net
+reuse RCVD_IN_ZEN_BLOCKED_OPENDNS
+
+# New blocked checks 10/2019
+header RCVD_IN_ZEN_BLOCKED eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.255\.255\.255$')
+describe RCVD_IN_ZEN_BLOCKED ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked. See https://www.spamhaus.org/returnc/vol/
+tflags RCVD_IN_ZEN_BLOCKED net
+reuse RCVD_IN_ZEN_BLOCKED
+
+if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
+dns_block_rule RCVD_IN_ZEN_BLOCKED_OPENDNS zen.spamhaus.org
+dns_block_rule RCVD_IN_ZEN_BLOCKED zen.spamhaus.org
+endif
+
+
# Now, single zone BLs follow:
# ---------------------------------------------------------------------------
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1868136&r1=1868135&r2=1868136&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Tue Oct 8 12:38:41 2019
@@ -60,6 +60,26 @@ if can(Mail::SpamAssassin::Plugin::URIDN
reuse URIBL_CSS_A
endif
+# New blocked checks 10/2019
+uridnssub URIBL_ZEN_BLOCKED_OPENDNS zen.spamhaus.org. A 127.255.255.254
+body URIBL_ZEN_BLOCKED_OPENDNS eval:check_uridnsbl('URIBL_ZEN_BLOCKED_OPENDNS')
+describe URIBL_ZEN_BLOCKED_OPENDNS ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked due to usage of an open resolver. See https://www.spamhaus.org/returnc/pub/
+tflags URIBL_ZEN_BLOCKED_OPENDNS net
+reuse URIBL_ZEN_BLOCKED_OPENDNS
+
+# New blocked checks 10/2019
+uridnssub URIBL_ZEN_BLOCKED zen.spamhaus.org. A 127.255.255.255
+body URIBL_ZEN_BLOCKED eval:check_uridnsbl('URIBL_ZEN_BLOCKED')
+describe URIBL_ZEN_BLOCKED ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked. See https://www.spamhaus.org/returnc/vol/
+tflags URIBL_ZEN_BLOCKED net
+reuse URIBL_ZEN_BLOCKED
+
+if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
+dns_block_rule URIBL_ZEN_BLOCKED_OPENDNS zen.spamhaus.org
+dns_block_rule URIBL_ZEN_BLOCKED zen.spamhaus.org
+endif
+
+
# DBL, https://www.spamhaus.org/dbl/
# changes axb 05-17-2014: as per https://www.spamhaus.org/news/article/713/
# SH changes effective 06-01-2014
@@ -128,6 +148,20 @@ describe URIBL_DBL_ERROR Error:
tflags URIBL_DBL_ERROR net domains_only
reuse URIBL_DBL_ERROR
+# New blocked checks 10/2019
+urirhssub URIBL_DBL_BLOCKED_OPENDNS dbl.spamhaus.org. A 127.255.255.254
+body URIBL_DBL_BLOCKED_OPENDNS eval:check_uridnsbl('URIBL_DBL_BLOCKED_OPENDNS')
+describe URIBL_DBL_BLOCKED_OPENDNS ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked due to usage of an open resolver. See https://www.spamhaus.org/returnc/pub/
+tflags URIBL_DBL_BLOCKED_OPENDNS net
+reuse URIBL_DBL_BLOCKED_OPENDNS
+
+# New blocked checks 10/2019
+urirhssub URIBL_DBL_BLOCKED dbl.spamhaus.org. A 127.255.255.255
+body URIBL_DBL_BLOCKED eval:check_uridnsbl('URIBL_DBL_BLOCKED')
+describe URIBL_DBL_BLOCKED ADMINISTRATOR NOTICE: The query to zen.spamhaus.org was blocked. See https://www.spamhaus.org/returnc/vol/
+tflags URIBL_DBL_BLOCKED net
+reuse URIBL_DBL_BLOCKED
+
endif
###########################################################################
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1868136&r1=1868135&r2=1868136&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Oct 8 12:38:41 2019
@@ -517,6 +517,9 @@ score RCVD_IN_SBL_CSS 0 3.558 0 3.335 #
score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
# </gen:mutable>
+score RCVD_IN_ZEN_BLOCKED_OPENDNS 0 0.001 0 0.001
+score RCVD_IN_ZEN_BLOCKED 0 0.001 0 0.001
+
# ReturnPath Certified
# https://www.returnpath.net/internetserviceprovider/certification/
# CERTIFIED is a subset of SAFE, thus the score is cumulative.
@@ -813,6 +816,10 @@ score URIBL_DBL_ABUSE_BOTCC 0 2.5 0 2.5
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
+score URIBL_ZEN_BLOCKED_OPENDNS 0 0.001 0 0.001
+score URIBL_ZEN_BLOCKED 0 0.001 0 0.001
+score URIBL_DBL_BLOCKED_OPENDNS 0 0.001 0 0.001
+score URIBL_DBL_BLOCKED 0 0.001 0 0.001
endif # Mail::SpamAssassin::Plugin::URIDNSBL
# ReplaceTags