You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2010/11/30 19:24:40 UTC

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

Author: mmartinec
Date: Tue Nov 30 18:24:40 2010
New Revision: 1040671

URL: http://svn.apache.org/viewvc?rev=1040671&view=rev
Log:
Bug 6499: Add rules for new Spamhaus whitelisting DWL

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=1040671&r1=1040670&r2=1040671&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Tue Nov 30 18:24:40 2010
@@ -1,4 +1,4 @@
-# SpamAssassin rules file: DNS blacklist tests
+# SpamAssassin rules file: DNS blacklist and whitelist tests
 #
 # Please don't modify this file as your changes will be overwritten with
 # the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
@@ -244,3 +244,20 @@ describe RCVD_IN_IADB_VOUCHED   ISIPP IA
 tflags RCVD_IN_IADB_VOUCHED     net nice
 
 endif
+
+
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+askdns   DKIMDOMAIN_IN_DWL  _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT /^([a-z]+ )*(transaction|list|all)( [a-z]+)*$/
+tflags   DKIMDOMAIN_IN_DWL  net nice
+describe DKIMDOMAIN_IN_DWL  Signing domain listed in Spamhaus DWL
+
+askdns   __DKIMDOMAIN_IN_DWL_ANY  _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT
+tflags   __DKIMDOMAIN_IN_DWL_ANY  net nice
+describe __DKIMDOMAIN_IN_DWL_ANY  Any TXT response received from a Spamhaus DWL
+
+meta DKIMDOMAIN_IN_DWL_UNKNOWN    __DKIMDOMAIN_IN_DWL_ANY && !DKIMDOMAIN_IN_DWL
+tflags   DKIMDOMAIN_IN_DWL_UNKNOWN  net nice
+describe DKIMDOMAIN_IN_DWL_UNKNOWN  Unrecognized response from Spamhaus DWL
+
+endif

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1040671&r1=1040670&r2=1040671&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Nov 30 18:24:40 2010
@@ -753,6 +753,8 @@ score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.69
 score DNS_FROM_RFC_BOGUSMX 0 1.464 0 1.668 # n=0 n=2
 score DNS_FROM_RFC_DSN 0 0.001 0 0.001 # n=0 n=2
 score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
+score DKIMDOMAIN_IN_DWL 0 -3.5 0 -3.5
+score DKIMDOMAIN_IN_DWL_UNKNOWN  0 -0.01 0 -0.01
 # </gen:mutable>
 
 # Spamhaus CSS does not appear in masschecks thus cannot be