You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by pd...@apache.org on 2019/03/26 07:40:29 UTC
svn commit: r1856264 - in /spamassassin/trunk/rulesrc: 10_force_active.cf
sandbox/pds/20_dkimwl.cf
Author: pds
Date: Tue Mar 26 07:40:29 2019
New Revision: 1856264
URL: http://svn.apache.org/viewvc?rev=1856264&view=rev
Log:
Added tflags and reuse to metas as per advice. Enabled DKIMWL_BLOCKED as won't hit for qa servers
Modified:
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/rulesrc/sandbox/pds/20_dkimwl.cf
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1856264&r1=1856263&r2=1856264&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Tue Mar 26 07:40:29 2019
@@ -85,6 +85,7 @@ publish DKIM_SIGNED
publish DKIM_VALID
publish DKIM_VALID_AU
publish DKIM_VERIFIED
+publish DKIMWL_BLOCKED
publish DOS_ANAL_SPAM_MAILER
publish DOS_FIX_MY_URI
publish DOS_HIGH_BAT_TO_MX
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_dkimwl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_dkimwl.cf?rev=1856264&r1=1856263&r2=1856264&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_dkimwl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_dkimwl.cf Tue Mar 26 07:40:29 2019
@@ -1,24 +1,38 @@
ifplugin Mail::SpamAssassin::Plugin::AskDNS
-askdns __DKIMWL_FREEMAIL _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.3\.\d+$/
-askdns __DKIMWL_BULKMAIL _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.2\.\d+$/
+askdns __DKIMWL_FREEMAIL _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.3\.\d+$/
+tflags __DKIMWL_FREEMAIL net
+reuse __DKIMWL_FREEMAIL
+
+askdns __DKIMWL_BULKMAIL _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.2\.\d+$/
+tflags __DKIMWL_BULKMAIL net
+reuse __DKIMWL_BULKMAIL
+
+askdns __DKIMWL_WL_HI _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.5$/
+tflags __DKIMWL_WL_HI net
+reuse __DKIMWL_WL_HI
+
+askdns __DKIMWL_WL_MEDHI _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.4$/
+tflags __DKIMWL_WL_MEDHI net
+reuse __DKIMWL_WL_MEDHI
+
+askdns __DKIMWL_WL_MED _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.3$/
+tflags __DKIMWL_WL_MED net
+reuse __DKIMWL_WL_MED
-askdns __DKIMWL_WL_HI _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.5$/
meta DKIMWL_WL_HIGH __DKIMWL_WL_HI && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO || __DKIMWL_FREEMAIL || __DKIMWL_BULKMAIL)
tflags DKIMWL_WL_HIGH nice net
describe DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender
score DKIMWL_WL_HIGH -3.0 # limit
reuse DKIMWL_WL_HIGH
-askdns __DKIMWL_WL_MEDHI _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.4$/
-meta DKIMWL_WL_MEDHI __DKIMWL_WL_MEDHI && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO || __DKIMWL_FREEMAIL || __DKIMWL_BULKMAIL)
+meta DKIMWL_WL_MEDHI __DKIMWL_WL_MEDHI && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO || __DKIMWL_FREEMAIL)
tflags DKIMWL_WL_MEDHI nice net
describe DKIMWL_WL_MEDHI DKIMwl.org - Medium-high sender
score DKIMWL_WL_MEDHI -1.0 # limit
reuse DKIMWL_WL_MEDHI
-askdns __DKIMWL_WL_MED _DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.3$/
-meta DKIMWL_WL_MED __DKIMWL_WL_MED && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO || __DKIMWL_FREEMAIL || __DKIMWL_BULKMAIL)
+meta DKIMWL_WL_MED __DKIMWL_WL_MED && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO || __DKIMWL_FREEMAIL)
tflags DKIMWL_WL_MED nice net
describe DKIMWL_WL_MED DKIMwl.org - Medium sender
score DKIMWL_WL_MED -0.5 # limit