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/05/03 06:31:23 UTC
svn commit: r1858559 - in /spamassassin/trunk/rulesrc/sandbox/pds:
20_freshfmb.cf 20_ntld.cf
Author: pds
Date: Fri May 3 06:31:22 2019
New Revision: 1858559
URL: http://svn.apache.org/viewvc?rev=1858559&view=rev
Log:
Change back to metas, nicer to dependant rules
Modified:
spamassassin/trunk/rulesrc/sandbox/pds/20_freshfmb.cf
spamassassin/trunk/rulesrc/sandbox/pds/20_ntld.cf
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_freshfmb.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_freshfmb.cf?rev=1858559&r1=1858558&r2=1858559&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_freshfmb.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_freshfmb.cf Fri May 3 06:31:22 2019
@@ -2,25 +2,37 @@
if (version >= 3.004001)
ifplugin Mail::SpamAssassin::Plugin::AskDNS
-askdns FROM_FMBLA_NEWDOM _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.2$/
+askdns __FROM_FMBLA_NEWDOM _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.2$/
+tflags __FROM_FMBLA_NEWDOM net
+
+askdns __FROM_FMBLA_NEWDOM14 _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.14$/
+tflags __FROM_FMBLA_NEWDOM14 net
+
+askdns __FROM_FMBLA_NEWDOM28 _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.14$/
+tflags __FROM_FMBLA_NEWDOM28 net
+
+askdns __FROM_FMBLA_NDBLOCKED _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.255\.255\.255$/
+tflags __FROM_FMBLA_NDBLOCKED net
+
+meta FROM_FMBLA_NEWDOM __FROM_FMBLA_NEWDOM
describe FROM_FMBLA_NEWDOM From domain was registered in last 7 days
tflags FROM_FMBLA_NEWDOM net publish
score FROM_FMBLA_NEWDOM 1.5 # limit
reuse FROM_FMBLA_NEWDOM
-askdns FROM_FMBLA_NEWDOM14 _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.14$/
+meta FROM_FMBLA_NEWDOM14 __FROM_FMBLA_NEWDOM14
describe FROM_FMBLA_NEWDOM14 From domain was registered in last 7-14 days
tflags FROM_FMBLA_NEWDOM14 net publish
score FROM_FMBLA_NEWDOM14 1.0 # limit
reuse FROM_FMBLA_NEWDOM14
-askdns FROM_FMBLA_NEWDOM28 _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.2\.0\.14$/
+meta FROM_FMBLA_NEWDOM28 __FROM_FMBLA_NEWDOM28
describe FROM_FMBLA_NEWDOM28 From domain was registered in last 14-28 days
tflags FROM_FMBLA_NEWDOM28 net publish
score FROM_FMBLA_NEWDOM28 0.8 # limit
reuse FROM_FMBLA_NEWDOM28
-askdns FROM_FMBLA_NDBLOCKED _AUTHORDOMAIN_.fresh.fmb.la. A /^127\.255\.255\.255$/
+meta FROM_FMBLA_NDBLOCKED __FROM_FMBLA_NDBLOCKED
describe FROM_FMBLA_NDBLOCKED ADMINISTRATOR NOTICE: The query to fresh.fmb.la was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information.
tflags FROM_FMBLA_NDBLOCKED net publish
score FROM_FMBLA_NDBLOCKED 0.001 # limit
@@ -29,7 +41,7 @@ reuse FROM_FMBLA_NDBLOCKED
header __NUMBERONLY_TLD From:addr =~ /\@[0-9]{4,}\.[a-z]+$/i
reuse __NUMBERONLY_TLD
-meta __PDS_NEWDOMAIN (FROM_FMBLA_NEWDOM || FROM_FMBLA_NEWDOM14 || FROM_FMBLA_NEWDOM28)
+meta __PDS_NEWDOMAIN (__FROM_FMBLA_NEWDOM || __FROM_FMBLA_NEWDOM14 || __FROM_FMBLA_NEWDOM28)
tflags __PDS_NEWDOMAIN net
reuse __PDS_NEWDOMAIN
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_ntld.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_ntld.cf?rev=1858559&r1=1858558&r2=1858559&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_ntld.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_ntld.cf Fri May 3 06:31:22 2019
@@ -74,5 +74,13 @@ describe SHORT_IMG_SUSP_NTLD Short HTML
score SHORT_IMG_SUSP_NTLD 1.5 # limit
reuse SHORT_IMG_SUSP_NTLD
+header __VPSNUMBERONLY_TLD From:addr =~ /\@vps[0-9]{4,}\.[a-z]+$/i
+reuse __VPSNUMBERONLY_TLD
+
+meta VPS_NO_NTLD __VPSNUMBERONLY_TLD && FROM_SUSPICIOUS_NTLD
+describe VPS_NO_NTLD vps[0-9] domain at a suspiscious TLD
+score VPS_NO_NTLD 1.0 # limit
+reuse VPS_NO_NTLD
+
endif
endif