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 2018/09/03 11:49:24 UTC
svn commit: r1839942 - in /spamassassin/trunk/rules: 20_dnsbl_tests.cf
20_mailspike.cf 25_dcc.cf 25_dkim.cf 25_uribl.cf 60_whitelist_dkim.cf
Author: hege
Date: Mon Sep 3 11:49:24 2018
New Revision: 1839942
URL: http://svn.apache.org/viewvc?rev=1839942&view=rev
Log:
Missing MANY "reuse" for net rules
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/20_mailspike.cf
spamassassin/trunk/rules/25_dcc.cf
spamassassin/trunk/rules/25_dkim.cf
spamassassin/trunk/rules/25_uribl.cf
spamassassin/trunk/rules/60_whitelist_dkim.cf
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Mon Sep 3 11:49:24 2018
@@ -148,23 +148,28 @@ reuse RCVD_IN_BL_SPAMCOP_NET
header RCVD_IN_MAPS_RBL eval:check_rbl('rblplus', 'activationcode.r.mail-abuse.com.', '1')
describe RCVD_IN_MAPS_RBL Relay in RBL, http://www.mail-abuse.com/enduserinfo_rbl.html
tflags RCVD_IN_MAPS_RBL net
+reuse RCVD_IN_MAPS_RBL
header RCVD_IN_MAPS_DUL eval:check_rbl('rblplus-lastexternal', 'activationcode.r.mail-abuse.com.', '2')
describe RCVD_IN_MAPS_DUL Relay in DUL, http://www.mail-abuse.com/enduserinfo_dul.html
tflags RCVD_IN_MAPS_DUL net
+reuse RCVD_IN_MAPS_DUL
header RCVD_IN_MAPS_RSS eval:check_rbl_sub('rblplus', '4')
describe RCVD_IN_MAPS_RSS Relay in RSS, http://www.mail-abuse.com/enduserinfo_rss.html
tflags RCVD_IN_MAPS_RSS net
+reuse RCVD_IN_MAPS_RSS
header RCVD_IN_MAPS_OPS eval:check_rbl_sub('rblplus', '8')
describe RCVD_IN_MAPS_OPS Relay in OPS, http://www.mail-abuse.com/enduserinfo_ops.html
tflags RCVD_IN_MAPS_OPS net
+reuse RCVD_IN_MAPS_OPS
# The NML isn't part of the RBL+ and I find any documentation for it - is it dead?
header RCVD_IN_MAPS_NML eval:check_rbl('nml', 'nonconfirm.mail-abuse.com.')
describe RCVD_IN_MAPS_NML Relay in NML, http://www.mail-abuse.com/enduserinfo_nml.html
tflags RCVD_IN_MAPS_NML net
+reuse RCVD_IN_MAPS_NML
# ---------------------------------------------------------------------------
# Section for DNS WL related lookups below.
@@ -172,10 +177,12 @@ tflags RCVD_IN_MAPS_NML net
# IADB support ...
header __RCVD_IN_IADB eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.')
tflags __RCVD_IN_IADB net nice
+reuse __RCVD_IN_IADB
header RCVD_IN_IADB_VOUCHED eval:check_rbl_sub('iadb-firsttrusted', '127.0.1.255')
describe RCVD_IN_IADB_VOUCHED ISIPP IADB lists as vouched-for sender
tflags RCVD_IN_IADB_VOUCHED net nice
+reuse RCVD_IN_IADB_VOUCHED
# ---------------------------------------------------------------------------
# Return Path Certified:
@@ -184,6 +191,7 @@ tflags RCVD_IN_IADB_VOUCHED net nice
header RCVD_IN_RP_CERTIFIED eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
describe RCVD_IN_RP_CERTIFIED Sender in ReturnPath Certified - Contact cert-sa@returnpath.net
tflags RCVD_IN_RP_CERTIFIED net nice
+reuse RCVD_IN_RP_CERTIFIED
# Return Path Safe:
# http://www.returnpath.net/internetserviceprovider/certification/
@@ -191,13 +199,14 @@ tflags RCVD_IN_RP_CERTIFIED net nice
header RCVD_IN_RP_SAFE eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
describe RCVD_IN_RP_SAFE Sender in ReturnPath Safe - Contact safe-sa@returnpath.net
tflags RCVD_IN_RP_SAFE net nice
+reuse RCVD_IN_RP_SAFE
# Return Path Reputation Network Blacklist (RNBL):
# https://senderscore.org/blacklistlookup/
header RCVD_IN_RP_RNBL eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
describe RCVD_IN_RP_RNBL Relay in RNBL, https://senderscore.org/blacklistlookup/
tflags RCVD_IN_RP_RNBL net
-
+reuse RCVD_IN_RP_RNBL
endif
@@ -207,12 +216,14 @@ ifplugin Mail::SpamAssassin::Plugin::Ask
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
+reuse DKIMDOMAIN_IN_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
+reuse __DKIMDOMAIN_IN_DWL_ANY
-meta DKIMDOMAIN_IN_DWL_UNKNOWN __DKIMDOMAIN_IN_DWL_ANY && !DKIMDOMAIN_IN_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
Modified: spamassassin/trunk/rules/20_mailspike.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_mailspike.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_mailspike.cf (original)
+++ spamassassin/trunk/rules/20_mailspike.cf Mon Sep 3 11:49:24 2018
@@ -5,49 +5,60 @@ ifplugin Mail::SpamAssassin::Plugin::DNS
## Spam sources
header __RCVD_IN_MSPIKE_B eval:check_rbl('mspikeb-lastexternal', 'bl.mailspike.net.')
tflags __RCVD_IN_MSPIKE_B net
+reuse __RCVD_IN_MSPIKE_B
## Ham sources
header __RCVD_IN_MSPIKE_L eval:check_rbl('mspikeg-firsttrusted', 'wl.mailspike.net.')
tflags __RCVD_IN_MSPIKE_L net
+reuse __RCVD_IN_MSPIKE_L
##### Reputation compensations
# Definitions - Bad senders
header __RCVD_IN_MSPIKE_Z eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.2')
describe __RCVD_IN_MSPIKE_Z Spam wave participant
tflags __RCVD_IN_MSPIKE_Z net
+reuse __RCVD_IN_MSPIKE_Z
header RCVD_IN_MSPIKE_L5 eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.10')
describe RCVD_IN_MSPIKE_L5 Very bad reputation (-5)
tflags RCVD_IN_MSPIKE_L5 net
+reuse RCVD_IN_MSPIKE_L5
header RCVD_IN_MSPIKE_L4 eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.11')
describe RCVD_IN_MSPIKE_L4 Bad reputation (-4)
tflags RCVD_IN_MSPIKE_L4 net
+reuse RCVD_IN_MSPIKE_L4
header RCVD_IN_MSPIKE_L3 eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.12')
describe RCVD_IN_MSPIKE_L3 Low reputation (-3)
tflags RCVD_IN_MSPIKE_L3 net
+reuse RCVD_IN_MSPIKE_L3
header RCVD_IN_MSPIKE_L2 eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.13')
describe RCVD_IN_MSPIKE_L2 Suspicious reputation (-2)
tflags RCVD_IN_MSPIKE_L2 net
+reuse RCVD_IN_MSPIKE_L2
# Definitions - Good senders
header RCVD_IN_MSPIKE_H5 eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.20')
describe RCVD_IN_MSPIKE_H5 Excellent reputation (+5)
tflags RCVD_IN_MSPIKE_H5 nice net
+reuse RCVD_IN_MSPIKE_H5
header RCVD_IN_MSPIKE_H4 eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.19')
describe RCVD_IN_MSPIKE_H4 Very Good reputation (+4)
tflags RCVD_IN_MSPIKE_H4 nice net
+reuse RCVD_IN_MSPIKE_H4
header RCVD_IN_MSPIKE_H3 eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.18')
describe RCVD_IN_MSPIKE_H3 Good reputation (+3)
tflags RCVD_IN_MSPIKE_H3 nice net
+reuse RCVD_IN_MSPIKE_H3
header RCVD_IN_MSPIKE_H2 eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.17')
describe RCVD_IN_MSPIKE_H2 Average reputation (+2)
tflags RCVD_IN_MSPIKE_H2 nice net
+reuse RCVD_IN_MSPIKE_H2
# *_L and *_Z may overlap each other, so account for that
meta __RCVD_IN_MSPIKE_LOW RCVD_IN_MSPIKE_L5 || RCVD_IN_MSPIKE_L4 || RCVD_IN_MSPIKE_L3
Modified: spamassassin/trunk/rules/25_dcc.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dcc.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dcc.cf (original)
+++ spamassassin/trunk/rules/25_dcc.cf Mon Sep 3 11:49:24 2018
@@ -35,24 +35,31 @@ reuse DCC_CHECK
full DCC_REPUT_00_12 eval:check_dcc_reputation_range(00,12)
describe DCC_REPUT_00_12 DCC reputation between 0 and 12 % (mostly ham)
tflags DCC_REPUT_00_12 nice net noautolearn
+reuse DCC_REPUT_00_12
full DCC_REPUT_13_19 eval:check_dcc_reputation_range(13,19)
+describe DCC_REPUT_13_19 DCC reputation between 13 and 19 %
tflags DCC_REPUT_13_19 net nice
+reuse DCC_REPUT_13_19
full DCC_REPUT_70_89 eval:check_dcc_reputation_range(70,89)
describe DCC_REPUT_70_89 DCC reputation between 70 and 89 %
tflags DCC_REPUT_70_89 net
+reuse DCC_REPUT_70_89
full DCC_REPUT_90_94 eval:check_dcc_reputation_range(90,94)
describe DCC_REPUT_90_94 DCC reputation between 90 and 94 %
tflags DCC_REPUT_90_94 net
+reuse DCC_REPUT_90_94
full DCC_REPUT_95_98 eval:check_dcc_reputation_range(95,98)
describe DCC_REPUT_95_98 DCC reputation between 95 and 98 % (mostly spam)
tflags DCC_REPUT_95_98 net
+reuse DCC_REPUT_95_98
full DCC_REPUT_99_100 eval:check_dcc_reputation_range(99)
describe DCC_REPUT_99_100 DCC reputation between 99 % or higher (spam)
tflags DCC_REPUT_99_100 net
+reuse DCC_REPUT_99_100
endif
Modified: spamassassin/trunk/rules/25_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dkim.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dkim.cf (original)
+++ spamassassin/trunk/rules/25_dkim.cf Mon Sep 3 11:49:24 2018
@@ -49,19 +49,29 @@ header DKIM_ADSP_CUSTOM_HIGH eval:check_
# sender to cause hits on them or to prevent them from firing, so their score
# should be kept low.
tflags DKIM_SIGNED net
+reuse DKIM_SIGNED
tflags DKIM_VALID net nice
+reuse DKIM_VALID
tflags DKIM_VALID_AU net nice
+reuse DKIM_VALID_AU
if (version >= 3.004002)
tflags DKIM_VALID_EF net nice
+ reuse DKIM_VALID_EF
endif
tflags DKIM_ADSP_NXDOMAIN net
+reuse DKIM_ADSP_NXDOMAIN
tflags DKIM_ADSP_DISCARD net
+reuse DKIM_ADSP_DISCARD
tflags DKIM_ADSP_ALL net
+reuse DKIM_ADSP_ALL
tflags DKIM_ADSP_CUSTOM_LOW net userconf
+reuse DKIM_ADSP_CUSTOM_LOW
tflags DKIM_ADSP_CUSTOM_MED net userconf
+reuse DKIM_ADSP_CUSTOM_MED
tflags DKIM_ADSP_CUSTOM_HIGH net userconf
+reuse DKIM_ADSP_CUSTOM_HIGH
describe DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid
describe DKIM_VALID Message has at least one valid DKIM or DK signature
@@ -84,6 +94,8 @@ full __RESIGNER1 eval:check_dkim_va
full __RESIGNER2 eval:check_dkim_valid('googlegroups.com','yahoogroups.com','yahoogroups.de')
tflags __RESIGNER1 net
tflags __RESIGNER2 net
+reuse __RESIGNER1
+reuse __RESIGNER2
meta __VIA_RESIGNER __RESIGNER1 || __RESIGNER2
describe __VIA_RESIGNER Mail through a popular signing remailer
@@ -101,8 +113,12 @@ header DKIM_POLICY_TESTING eval:check_dk
header DKIM_POLICY_SIGNSOME eval:check_dkim_signsome()
header DKIM_POLICY_SIGNALL eval:check_dkim_signall()
tflags DKIM_VERIFIED net nice
+reuse DKIM_VERIFIED
tflags DKIM_POLICY_SIGNSOME net nice
+reuse DKIM_POLICY_SIGNSOME
tflags DKIM_POLICY_SIGNALL net nice
+reuse DKIM_POLICY_SIGNALL
tflags DKIM_POLICY_TESTING net nice
+reuse DKIM_POLICY_TESTING
endif # Mail::SpamAssassin::Plugin::DKIM
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Mon Sep 3 11:49:24 2018
@@ -46,6 +46,7 @@ if (version >= 3.004000)
body URIBL_SBL_A eval:check_uridnsbl('URIBL_SBL_A')
describe URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist
tflags URIBL_SBL_A net a
+ reuse URIBL_SBL_A
endif
endif
@@ -58,46 +59,55 @@ urirhssub URIBL_DBL_SPAM dbl.sp
body URIBL_DBL_SPAM eval:check_uridnsbl('URIBL_DBL_SPAM')
describe URIBL_DBL_SPAM Contains a spam URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_SPAM net domains_only
+reuse URIBL_DBL_SPAM
urirhssub URIBL_DBL_PHISH dbl.spamhaus.org. A 127.0.1.4
body URIBL_DBL_PHISH eval:check_uridnsbl('URIBL_DBL_PHISH')
describe URIBL_DBL_PHISH Contains a Phishing URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_PHISH net domains_only
+reuse URIBL_DBL_PHISH
urirhssub URIBL_DBL_MALWARE dbl.spamhaus.org. A 127.0.1.5
body URIBL_DBL_MALWARE eval:check_uridnsbl('URIBL_DBL_MALWARE')
describe URIBL_DBL_MALWARE Contains a malware URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_MALWARE net domains_only
+reuse URIBL_DBL_MALWARE
urirhssub URIBL_DBL_BOTNETCC dbl.spamhaus.org. A 127.0.1.6
body URIBL_DBL_BOTNETCC eval:check_uridnsbl('URIBL_DBL_BOTNETCC')
describe URIBL_DBL_BOTNETCC Contains a botned C&C URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_BOTNETCC net domains_only
+reuse URIBL_DBL_BOTNETCC
urirhssub URIBL_DBL_ABUSE_SPAM dbl.spamhaus.org. A 127.0.1.102
body URIBL_DBL_ABUSE_SPAM eval:check_uridnsbl('URIBL_DBL_ABUSE_SPAM')
describe URIBL_DBL_ABUSE_SPAM Contains an abused spamvertized URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_ABUSE_SPAM net domains_only
+reuse URIBL_DBL_ABUSE_SPAM
urirhssub URIBL_DBL_ABUSE_REDIR dbl.spamhaus.org. A 127.0.1.103
body URIBL_DBL_ABUSE_REDIR eval:check_uridnsbl('URIBL_DBL_ABUSE_REDIR')
describe URIBL_DBL_ABUSE_REDIR Contains an abused redirector URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_ABUSE_REDIR net domains_only
+reuse URIBL_DBL_ABUSE_REDIR
urirhssub URIBL_DBL_ABUSE_PHISH dbl.spamhaus.org. A 127.0.1.104
body URIBL_DBL_ABUSE_PHISH eval:check_uridnsbl('URIBL_DBL_ABUSE_PHISH')
describe URIBL_DBL_ABUSE_PHISH Contains an abused phishing URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_ABUSE_PHISH net domains_only
+reuse URIBL_DBL_ABUSE_PHISH
urirhssub URIBL_DBL_ABUSE_MALW dbl.spamhaus.org. A 127.0.1.105
body URIBL_DBL_ABUSE_MALW eval:check_uridnsbl('URIBL_DBL_ABUSE_MALW')
describe URIBL_DBL_ABUSE_MALW Contains an abused malware URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_ABUSE_MALW net domains_only
+reuse URIBL_DBL_ABUSE_MALW
urirhssub URIBL_DBL_ABUSE_BOTCC dbl.spamhaus.org. A 127.0.1.106
body URIBL_DBL_ABUSE_BOTCC eval:check_uridnsbl('URIBL_DBL_ABUSE_BOTCC')
describe URIBL_DBL_ABUSE_BOTCC Contains an abused botnet C&C URL listed in the Spamhaus DBL blocklist
tflags URIBL_DBL_ABUSE_BOTCC net domains_only
+reuse URIBL_DBL_ABUSE_BOTCC
# this indicates that IP-address queries were sent to DBL, and should
@@ -106,6 +116,8 @@ urirhssub URIBL_DBL_ERROR dbl.spa
body URIBL_DBL_ERROR eval:check_uridnsbl('URIBL_DBL_ERROR')
describe URIBL_DBL_ERROR Error: queried the Spamhaus DBL blocklist for an IP
tflags URIBL_DBL_ERROR net domains_only
+reuse URIBL_DBL_ERROR
+
endif
###########################################################################
Modified: spamassassin/trunk/rules/60_whitelist_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_dkim.cf?rev=1839942&r1=1839941&r2=1839942&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_dkim.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_dkim.cf Mon Sep 3 11:49:24 2018
@@ -29,10 +29,12 @@ ifplugin Mail::SpamAssassin::Plugin::DKI
header USER_IN_DKIM_WHITELIST eval:check_for_dkim_whitelist_from()
describe USER_IN_DKIM_WHITELIST From: address is in the user's DKIM whitelist
tflags USER_IN_DKIM_WHITELIST nice noautolearn net userconf
+reuse USER_IN_DKIM_WHITELIST
header USER_IN_DEF_DKIM_WL eval:check_for_def_dkim_whitelist_from()
describe USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list
tflags USER_IN_DEF_DKIM_WL nice noautolearn net
+reuse USER_IN_DEF_DKIM_WL
###########################################################################
# Default whitelists. These should be e-mail addresses of authors (i.e.