You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2009/11/23 00:56:18 UTC
svn commit: r883193 - in /spamassassin/trunk/rulesrc/sandbox/khopesh:
20_khop_blessed.cf 20_khop_general.cf 20_khop_lists.cf
20_khop_sc_bug_6114.cf 20_s25r.cf
Author: khopesh
Date: Sun Nov 22 23:56:17 2009
New Revision: 883193
URL: http://svn.apache.org/viewvc?rev=883193&view=rev
Log:
khop channels - added safeties as per Warren's warnings, tweaks, updates
Modified:
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf?rev=883193&r1=883192&r2=883193&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf Sun Nov 22 23:56:17 2009
@@ -6,29 +6,35 @@
# 2007/02/27 - Syntax taken from the OpenPGP standard, RFC 2440 section 6.2
if ! plugin (Mail::SpamAssassin::Plugin::OpenPGP)
# moved from rawbody to body 20091021
- body __KHOP_PGP_I1 /-----BEGIN PGP (?:SIGNATURE|MESSAGE|PUBLIC|PRIVATE)(?:, PART [0-9]{1,4}\/[0-9]{1,4}| KEY BLOCK)?-----/
- tflags __KHOP_PGP_I1 nice
- body __KHOP_PGP_I2 /-----END PGP/
- tflags __KHOP_PGP_I2 nice
- meta KHOP_PGP_INLINE ( __KHOP_PGP_I1 && __KHOP_PGP_I2 )
+ body __PGP_I1 /-----BEGIN PGP (?:SIGNATURE|MESSAGE|PUBLIC|PRIVATE)(?:, PART [0-9]{1,4}\/[0-9]{1,4}| KEY BLOCK)?-----/
+ tflags __PGP_I1 nice
+ body __PGP_I2 /-----END PGP/
+ tflags __PGP_I2 nice
+ meta __PGP_INLINE ( __KHOP_PGP_I1 && __KHOP_PGP_I2 )
+ tflags __PGP_INLINE nice noautolearn
+ meta KHOP_PGP_INLINE __PGP_INLINE
describe KHOP_PGP_INLINE BODY: Contains PGP data
tflags KHOP_PGP_INLINE nice noautolearn nopublish
#score KHOP_PGP_INLINE -2 -2 -3 -3
# 2005/12/14 - worthwhile even though we're not verifying the sig
- header KHOP_PGP_SIGNED Content-Type =~ /multipart\/signed;.*\/pgp-signature/s
- describe KHOP_PGP_SIGNED Message seems to contain PGP signature
- tflags KHOP_PGP_SIGNED nice noautolearn
- #score KHOP_PGP_SIGNED -2 -2 -3 -3 # none net bayes net+bayes
+ header __PGP_SIGNED Content-Type =~ /multipart\/signed;.*\/pgp-signature/s
+ tflags __PGP_SIGNED nice noautolearn
+ meta KHOP_PGP_SIGNED __PGP_SIGNED
+ describe KHOP_PGP_SIGNED Message seems to contain PGP signature
+ tflags KHOP_PGP_SIGNED nice noautolearn nopublish
+ #score KHOP_PGP_SIGNED -2 -2 -3 -3 # none net bayes net+bayes
endif
# 20091016 after much testing, has yet to hit a SINGLE spam (hits ~38% of ham)
# 20091121 masscheck features 1.0255% spam to 39.3385% ham (S/O=0.025)
# NOTE: This may soon move to khop-general if it is needed as a dependency
-#meta KHOP_THREADED !__MISSING_REF || !__MISSING_REPLY || !__MISSING_THREAD
-meta KHOP_THREADED (!__MISSING_REPLY && !__NO_INR_YES_REF) || (__MISSING_REPLY && !__MISSING_REF)
+#meta KHOP_THREADED !__MISSING_REF || !__MISSING_REPLY || !__MISSING_THREAD
+meta __THREADED (!__MISSING_REPLY && !__NO_INR_YES_REF) || (__MISSING_REPLY && !__MISSING_REF)
+tflags __THREADED nice
+meta KHOP_THREADED __THREADED
# Note that this does NOT verify legitimacy of referenced MSGIDs.
-describe KHOP_THREADED Message references or replies to another message
-tflags KHOP_THREADED nice
-#score KHOP_THREADED -0.5 -0.5 -1.5 -1.5 # EASILY abused -- keep minimal
+describe KHOP_THREADED Message references or replies to another message
+tflags KHOP_THREADED nice nopublish
+#score KHOP_THREADED -0.5 -0.5 -1.5 -1.5 # EASILY abused -- keep minimal
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf?rev=883193&r1=883192&r2=883193&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf Sun Nov 22 23:56:17 2009
@@ -6,7 +6,8 @@
# Now looks for two DIFFERENT IPs, be they HELO or rDNS or real IP. 20091008
# This does NOT hit assumed HELOs like Received: [10.2.3.4] (foo [1.2.3.4])
# SpamAssassin has a bug(?) that reads ALL Received headers concatenated as one
-header TWO_IPS_RCVD Received =~ /[\[\(\s]((?:[12]?\d\d?\.){3}[12]?\d\d?)[\[\(\s][^\[\n;,]{0,99}\[(?!\1)\d/
+header __TWO_IPS_RCVD Received =~ /[\[\(\s]((?:[12]?\d\d?\.){3}[12]?\d\d?)[\[\(\s][^\[\n;,]{0,99}\[(?!\1)\d/
+meta TWO_IPS_RCVD __TWO_IPS_RCVD && !ALL_TRUSTED
describe TWO_IPS_RCVD Received: Relay identifies itself as wrong IP
#score 1.25 # 20050729
@@ -16,7 +17,8 @@
#score MAY_BE_FORGED 0.8 # 20050802, raised 0.15->0.8 20090603
# Note: unfair regarding RFC 2821, see http://en.wikipedia.org/wiki/FCrDNS#Uses
-header KHOP_HELO_FCRDNS X-Spam-Relays-External =~ /^[^\]]+ rdns=(\S+) helo=(?!\1)\S/
+header __HELO_NOT_RDNS X-Spam-Relays-External =~ /^[^\]]+ rdns=(\S+) helo=(?!\1)\S/
+meta KHOP_HELO_FCRDNS __HELO_NOT_RDNS && !(__VIA_ML || __freemail_safe || __RCVD_IN_DNSWL || !__NOT_SPOOFED)
describe KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS
#score KHOP_HELO_FCRDNS 0.4 # 20090603, currently scoring 0.001
score KHOP_HELO_FCRDNS 0.001
@@ -39,7 +41,7 @@
body DEAR_EMAIL /^\s*Dear\b.{0,70}\w\@\w/i
describe DEAR_EMAIL Message contains Dear email address
-score DEAR_EMAIL 0.5 # 20090424
+#score DEAR_EMAIL 0.5 # 20090424
body DEAR_NOBODY /^\s*Dear\b[^a-zA-Z]{0,70}$/i
describe DEAR_NOBODY Message contains Dear but with no name
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf?rev=883193&r1=883192&r2=883193&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf Sun Nov 22 23:56:17 2009
@@ -7,13 +7,13 @@
uri __UNSUB_LINK /\b(?:(?:un)?subscri(?:ber?|ptions?)|abuses?|opt(?:ing)?.?out)\b/i
uri __MAIL_LINK /\?.{0,200}\w@[\w-]{1,20}.\w\w\w?\b/i
-#meta KHOP_UNSUB_LINK __UNSUB_LINK && !SARE_UNI && !(__LIST_HEADER||____VIA_ML||__SENDER_BOT)
-meta KHOP_UNSUB_LINK __UNSUB_LINK && !(__VIA_ML||__SENDER_BOT)
+#meta KHOP_UNSUB_LINK __UNSUB_LINK && !(SARE_UNI||__VIA_ML||__SENDER_BOT)
+meta KHOP_UNSUB_LINK __UNSUB_LINK && !(__VIA_ML||__SENDER_BOT)
describe KHOP_UNSUB_LINK Non-list message has unsusbscribe link
tflags KHOP_UNSUB_LINK nopublish
score KHOP_UNSUB_LINK 0.5 0.6 0.7 0.8
-meta KHOP_MAIL_LINK __MAIL_LINK && !__UNSUB_LINK
+meta KHOP_MAIL_LINK __MAIL_LINK && !(__UNSUB_LINK||__VIA_ML||__SENDER_BOT)
describe KHOP_MAIL_LINK A link contains an email address in the URL
tflags KHOP_MAIL_LINK nopublish
#score KHOP_MAIL_LINK 0.1 0.2 0.3 0.4
@@ -23,7 +23,7 @@
# From: must start w/ ~uppercase, ~letters, space/punctuation, then ~uppercase.
header __FROM_FULL_NAME From:name =~ /^[^a-z[:punct:][:cntrl:]\d\s][^[:punct:][:cntrl:]\d\s]*[[:punct:]\s]+[^a-z[:punct:][:cntrl:]\d\s]/
tflags __FROM_FULL_NAME nice
-meta KHOP_NO_FULL_NAME !(__VIA_ML || __FROM_ENCODED_QP || __FROM_NEEDS_MIME || __FROM_FULL_NAME)
+meta KHOP_NO_FULL_NAME !(__VIA_ML || __SENDER_BOT || __FROM_ENCODED_QP || __FROM_NEEDS_MIME || __FROM_FULL_NAME)
describe KHOP_NO_FULL_NAME Sender does not have both First and Last names
#score KHOP_NO_FULL_NAME 0.259 # keep low! 20090220, sa-users @20090514
score KHOP_NO_FULL_NAME 0.001 # apparently hits the same on ham v spam
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf?rev=883193&r1=883192&r2=883193&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf Sun Nov 22 23:56:17 2009
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf v 200911220
+## khop-sc-neighbors.cf v 2009112218
## Khopesh's syndication of SpamCop's top offenders and top offending networks.
##
## Spamassassin rules written by Adam Katz <antispamATkhopiscom>
@@ -33,7 +33,7 @@
# http://www.spamcop.net/w3m?action=map;net=bmaxcnt;mask=16777215;sort=spamcnt
-header KHOP_SC_CIDR16 Received =~ /(?-xism:\b(?:1(?:8(?:9\.111|7\.4)|18\.(?:173|96)|90\.24)|203\.210)(?:\.[012]?[0-9]{1,2}){2}\b)/
+header KHOP_SC_CIDR16 Received =~ /(?-xism:\b(?:1(?:8(?:9\.111|7\.4)|18\.173|22\.168|90\.24)|203\.210)(?:\.[012]?[0-9]{1,2}){2}\b)/
describe KHOP_SC_CIDR16 Relay listed in SpamCop top 12 IP/16 CIDRs
score KHOP_SC_CIDR16 0.6 0.5 0.9 0.75
@@ -53,7 +53,7 @@
# http://spamcop.net/w3m?action=map;net=cmaxcnt;mask=65535;sort=spamcnt
-header KHOP_SC_CIDR24 Received =~ /(?-xism:\b(?:1(?:74\.143\.151|93\.108\.38)|2(?:20\.231\.127|09\.94\.196)|6(?:1\.178\.81|2\.61\.164))\.[012]?[0-9]{1,2}\b)/
+header KHOP_SC_CIDR24 Received =~ /(?-xism:\b(?:2(?:20\.231\.127|09\.94\.196)|1(?:13\.161\.16|93\.108\.38)|89\.232\.105|62\.61\.164)\.[012]?[0-9]{1,2}\b)/
describe KHOP_SC_CIDR24 Relay listed in SpamCop top 12 IP/24 CIDRs
score KHOP_SC_CIDR24 0.9 0.8 1.3 1.2
# http://ruleqa.spamassassin.org/week/KHOP_SC_CIDR24/detail
@@ -64,13 +64,13 @@
#counts KHOP_SC_CIDR24 240s/0h of 928863 corpus (899498s/29365h dos) 05/25/09
#counts KHOP_SC_CIDR24 0s/0h of 35258 corpus (10292s/24966h jm) 05/25/09
-header KHOP_SC_TOP_CIDR24 Received =~ /(?-xism:\b(?:1(?:11\.224\.250|74\.143\.148)|202\.75\.37|58\.18\.168|93\.186\.96|0\.0\.0)\.[012]?[0-9]{1,2}\b)/
+header KHOP_SC_TOP_CIDR24 Received =~ /(?-xism:\b(?:1(?:11\.224\.250|74\.143\.151)|202\.75\.37|58\.18\.168|93\.186\.96|0\.0\.0)\.[012]?[0-9]{1,2}\b)/
describe KHOP_SC_TOP_CIDR24 Relay listed in SpamCop top 6 IP/24 CIDRs
score KHOP_SC_TOP_CIDR24 1.7 1.5 1.9 1.8
# http://www.spamcop.net/w3m?action=hoshame
-header KHOP_SC_TOP200 Received =~ /(?-xism:\b(?:2(?:1(?:1\.(?:1(?:9(?:1\.174\.141|8\.225\.206)|25\.117\.238|71\.255\.237|52\.12\.114)|2(?:02\.2\.(?:48|97)|45\.104\.106))|3\.(?:1(?:5(?:7\.196\.17|6\.192\.)5|86\.57\.129)|2(?:27\.(?:219\.58|72\.146)|51\.162\.218))|0\.(?:21(?:2\.(?:197\.16|248\.22)|9\.173\.6)2|1(?:27\.253\.121|10\.49\.39))|8\.(?:248\.(?:44\.196|30\.67)|38\.1(?:2\.246|8\.201))|2\.(?:1(?:50\.22\.143|98\.38\.145)|59\.22\.136)|7\.1(?:99\.231\.249|6\.69\.8)|9\.254\.35\.45)|0(?:0\.(?:2(?:6\.1(?:48\.62|71\.86)|16\.152\.210)|1(?:41\.87\.135|60\.49\.12)|56\.224\.17|80\.140\.61)|3\.(?:1(?:71\.181\.35|01\.104\.2)|210\.224\.136|90\.137\.18)|2\.(?:75\.37\.2(?:4[03]|27|53)|181\.234\.218|31\.135\.52)|1\.(?:116\.198\.114|251\.250\.3)|9\.(?:172\.35\.112|94\.196\.170)|8\.89\.219\.1(?:34|53)|6\.169\.30\.117)|2(?:0\.(?:2(?:31\.(?:1(?:01\.214|12\.10)|69\.13)|27\.(?:170\.197|35\.234)|41\.246\.97)|95\.232\.26)|1\.(?:1(?:39\.(?:50\.41|0\.97)|20\.224\.146|43\.48\.107)|2(?:14\.164\.24
0|\.98\.206)|5\.67\.2)|2\.(?:2(?:5(?:5\.128\.158|2\.223\.2|4\.108\.4)|37\.78\.177)|122\.158\.185))|4\.1(?:56\.108\.188|99\.205\.252))|1(?:1(?:8\.(?:1(?:75\.(?:6\.138|5\.77)|30\.112\.235)|70\.127\.241|69\.69\.122|96\.24\.156)|1\.(?:224\.250\.(?:6[478]|70)|68\.111\.195)|0\.(?:172\.167\.37|45\.146\.169)|3\.16(?:0\.248\.101|1\.17\.194)|6\.(?:47\.133\.40|50\.249\.2)|7\.25\.129\.200|5\.68\.2\.15)|2(?:5\.(?:2(?:34\.18\.130|0\.67\.66)|46\.73\.179|7\.221\.146)|1\.1(?:8(?:5\.156\.185|7\.85\.114)|0\.127\.158)|4\.(?:(?:124\.52\.16|81\.109\.8)2|0\.18\.130)|2\.252\.234\.74|3\.30\.9\.250)|9(?:5\.(?:2(?:8\.130\.21|4\.71\.92)|1(?:89\.45\.11|61\.9\.2))|0\.(?:196\.13\.66|6\.172\.98|81\.54\.33)|3\.1(?:08\.38\.228|98\.8\.211)|4\.135\.105\.232)|74\.(?:143\.151\.(?:65|80)|36\.201\.222)|48\.233\.80\.145|89\.54\.125\.92)|9(?:4\.(?:2(?:3\.(?:(?:215\.5|35\.18)0|12\.122|45\.154|5\.161)|51\.113\.140)|1(?:0(?:3\.33\.128|2\.7\.104)|59\.202\.199|73\.9\.220)|77\.48\.5)|1\.(?:1(?:21\.(?:1(?:4(?:8\.189|\.198)
|05\.224)|(?:23\.20|77\.15)5|8(?:1\.99|3\.5))|9(?:2\.144\.9|3\.199\.4)|32\.70\.11)|200\.212\.5)|5\.(?:154\.240\.98|86\.78\.80)|2\.243\.17\.217|3\.122\.135\.4)|6(?:1\.1(?:0(?:9\.245\.206|0\.14\.234)|78\.(?:126\.206|81\.100)|48\.102\.110|58\.163\.112)|7\.2(?:2(?:7\.(?:153\.217|213\.202)|5\.17(?:7\.110|9\.86))|05\.111\.46)|6\.(?:4(?:6\.179\.10|9\.137\.29)|242\.25\.198)|2\.1(?:69\.150\.234|48\.88\.98)|5\.204\.173\.139|0\.213\.48\.250|9\.13\.42\.151|4\.6\.236\.15)|8(?:0\.(?:93\.(?:125\.18|215\.10)6|235\.105\.140|70\.96\.178)|5\.1(?:(?:70\.32\.15|0\.194\.3)4|92\.33\.96)|4\.(?:22\.140\.186|17\.11\.114|32\.238\.19)|3\.14(?:2\.111\.228|3\.151\.165)|9\.(?:190\.197\.14|97\.183\.195)|1\.1(?:12\.190\.195|92\.1\.254)|2\.239\.205\.187|7\.117\.253\.240)|7(?:2\.(?:5(?:1\.38\.152|5\.156\.41)|21\.6\.17)|4\.(?:208\.167\.189|50\.85\.108)|7\.7(?:8\.161\.136|0\.54\.81)|5\.126\.49\.149|9\.171\.18\.217|0\.38\.54\.133)|5(?:8\.1(?:8\.168\.16[2356]|20\.227\.149)|9\.160\.177\.27))\b)/
+header KHOP_SC_TOP200 Received =~ /(?-xism:\b(?:2(?:1(?:1\.(?:1(?:9(?:1\.174\.141|8\.225\.206)|25\.117\.238|71\.255\.237|52\.12\.114)|2(?:02\.2\.(?:48|97)|45\.104\.106))|3\.(?:1(?:5(?:7\.196\.17|6\.192\.)5|86\.57\.129)|2(?:27\.(?:219\.58|72\.146)|51\.162\.218))|0\.(?:1(?:27\.253\.121|10\.49\.39)|21(?:2\.248\.22|9\.173\.6)2)|2\.(?:1(?:(?:50\.22\.14|43\.76\.9)3|98\.38\.145)|59\.22\.136)|8\.(?:248\.(?:44\.196|30\.67)|38\.1(?:2\.246|8\.201))|7\.1(?:99\.231\.249|6\.69\.8)|9\.254\.35\.45)|0(?:0\.(?:2(?:6\.1(?:48\.62|71\.86)|16\.152\.210)|1(?:41\.87\.135|60\.49\.12)|56\.224\.17|80\.140\.61)|2\.(?:75\.37\.2(?:4[03]|27|53)|181\.234\.218|31\.135\.52)|3\.(?:1(?:71\.181\.35|01\.104\.2)|90\.137\.18)|1\.(?:116\.198\.114|251\.250\.3)|9\.(?:172\.35\.112|94\.196\.170)|8\.89\.219\.1(?:34|53)|6\.169\.30\.117)|2(?:0\.(?:2(?:31\.(?:1(?:01\.214|12\.10)|69\.13)|27\.(?:170\.197|35\.234)|41\.246\.97)|95\.232\.26)|1\.(?:1(?:39\.(?:50\.41|0\.97)|20\.224\.146)|2(?:14\.164\.240|\.98\.206)|5\.67\.2)|2
\.(?:2(?:37\.78\.177|52\.223\.2)|122\.158\.185))|4\.1(?:56\.108\.188|99\.205\.252))|1(?:1(?:8\.(?:1(?:30\.112\.235|75\.5\.77)|70\.127\.241|69\.69\.122|96\.24\.156)|3\.16(?:1\.1(?:7\.194|6\.60)|0\.248\.101|9\.176\.24)|0\.(?:1(?:39\.56\.125|72\.167\.37)|45\.146\.169)|1\.(?:224\.250\.(?:6[78]|133|70)|68\.111\.195)|6\.(?:47\.133\.40|50\.249\.2)|7\.25\.129\.200|5\.68\.2\.15)|2(?:4\.(?:(?:124\.52\.16|81\.109\.8)2|2\.205\.254|0\.18\.130)|1\.1(?:8(?:5\.156\.185|7\.85\.114)|0\.127\.158)|5\.(?:234\.18\.130|46\.73\.179|7\.221\.146)|2\.252\.234\.74|3\.30\.9\.250)|9(?:5\.(?:1(?:89\.45\.11|61\.9\.2)|24\.71\.92)|3\.1(?:08\.38\.228|89\.86\.72|98\.8\.211)|0\.(?:196\.13\.66|6\.172\.98|81\.54\.33)|4\.135\.105\.232)|74\.(?:143\.151\.(?:65|80)|36\.201\.222)|4(?:0\.113\.121\.101|8\.233\.80\.145)|89\.54\.125\.92)|9(?:1\.(?:1(?:21\.(?:1(?:4(?:8\.189|\.198)|05\.224)|(?:23\.20|77\.15)5|8(?:1\.99|3\.5))|9(?:2\.144\.9|3\.199\.4)|32\.70\.11)|2(?:00\.212\.5|14\.16\.42))|4\.(?:2(?:3\.(?:(?:215\.5|35\.18)0
|12\.122|45\.154|5\.161)|51\.113\.140)|1(?:0(?:3\.33\.128|2\.7\.104)|59\.202\.199|73\.9\.220)|77\.48\.5)|5\.(?:154\.240\.98|86\.78\.80)|2\.243\.17\.217|3\.122\.135\.4)|6(?:1\.1(?:0(?:9\.245\.206|0\.14\.234)|78\.(?:126\.206|81\.100)|48\.102\.110|58\.163\.112)|7\.2(?:2(?:7\.(?:153\.217|213\.202)|5\.17(?:7\.110|9\.86))|05\.111\.46)|6\.(?:4(?:6\.179\.10|9\.137\.29)|242\.25\.198)|2\.1(?:69\.150\.234|48\.88\.98)|5\.204\.173\.139|0\.213\.48\.250|9\.13\.42\.151|4\.6\.236\.15)|8(?:0\.(?:93\.(?:125\.18|215\.10)6|235\.105\.140|70\.96\.178)|3\.1(?:4(?:2\.111\.228|3\.151\.165)|9\.164\.58)|5\.1(?:(?:70\.32\.15|0\.194\.3)4|92\.33\.96)|4\.(?:22\.140\.186|17\.11\.114|32\.238\.19)|9\.(?:190\.197\.14|97\.183\.195)|1\.1(?:12\.190\.195|92\.1\.254)|2\.239\.205\.187|7\.117\.253\.240)|7(?:4\.(?:208\.167\.189|50\.85\.108)|7\.7(?:8\.161\.136|0\.54\.81)|2\.(?:55\.156\.41|21\.6\.17)|5\.126\.49\.149|9\.171\.18\.217|0\.38\.54\.133)|5(?:8\.1(?:8\.168\.16[2356]|20\.227\.149)|9\.160\.177\.27))\b)/
describe KHOP_SC_TOP200 Relay listed in SpamCop top 200 spammer IPs
score KHOP_SC_TOP200 3.4 3.2 3.7 3.5
# http://ruleqa.spamassassin.org/week/KHOP_SC_TOP200/detail
@@ -81,7 +81,7 @@
#counts KHOP_SC_TOP200 1s/0h of 35244 corpus (10278s/24966h jm) 05/25/09
# assumed overlap: 98+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)
-#header KHOP_SC_TOP100 Received =~ /(?-xism:\b(?:2(?:1(?:1\.(?:1(?:71\.255\.237|52\.12\.114)|202\.2\.48)|2\.(?:1(?:50\.22\.143|98\.38\.145)|59\.22\.136)|(?:3\.227\.72\.14|8\.248\.44\.19)6|0\.1(?:27\.253\.121|10\.49\.39)|7\.1(?:99\.231\.249|6\.69\.8))|0(?:0\.(?:160\.49\.12|26\.171\.86)|2\.(?:31\.135\.52|75\.37\.240)|3\.(?:101\.104\.2|90\.137\.18)|6\.169\.30\.117|9\.172\.35\.112)|2(?:0\.(?:227\.35\.234|95\.232\.26)|1\.(?:139\.50\.41|2\.98\.206)|2\.237\.78\.177)|4\.1(?:56\.108\.188|99\.205\.252))|1(?:2(?:1\.1(?:0\.127\.158|87\.85\.114)|2\.252\.234\.74|4\.124\.52\.162|5\.46\.73\.179)|1(?:(?:3\.160\.248\.10|8\.70\.127\.24)1|1\.68\.111\.195|6\.50\.249\.2)|9(?:0\.(?:196\.13\.66|6\.172\.98)|3\.108\.38\.228|5\.189\.45\.11)|74\.36\.201\.222)|9(?:4\.(?:2(?:3\.(?:(?:215\.5|35\.18)0|45\.154|5\.161)|51\.113\.140)|159\.202\.199)|1\.1(?:21\.(?:14(?:8\.189|\.198)|8(?:1\.99|3\.5)|23\.205)|92\.144\.9)|2\.243\.17\.217|3\.122\.135\.4)|8(?:0\.(?:235\.105\.140|93\.215\.106)|3\.14(?:2\.111\.228|
3\.151\.165)|9\.(?:190\.197\.14|97\.183\.195)|2\.239\.205\.187|4\.17\.11\.114|5\.192\.33\.96)|6(?:1\.1(?:48\.102\.110|78\.126\.206)|2\.1(?:69\.150\.234|48\.88\.98)|6\.(?:242\.25\.198|49\.137\.29)|5\.204\.173\.139|7\.225\.179\.86)|7(?:4\.(?:208\.167\.189|50\.85\.108)|5\.126\.49\.149|0\.38\.54\.133|7\.70\.54\.81|2\.21\.6\.17)|5(?:8\.18\.168\.165|9\.160\.177\.27))\b)/
+#header KHOP_SC_TOP100 Received =~ /(?-xism:\b(?:2(?:0(?:2\.(?:75\.37\.2(?:4[03]|27)|31\.135\.52)|0\.(?:160\.49\.12|26\.171\.86)|3\.(?:101\.104\.2|90\.137\.18)|6\.169\.30\.117|9\.172\.35\.112)|1(?:(?:3\.227\.72\.14|8\.248\.44\.19)6|0\.1(?:27\.253\.121|10\.49\.39)|2\.(?:150\.22\.143|59\.22\.136)|7\.1(?:99\.231\.249|6\.69\.8))|2(?:0\.(?:227\.35\.234|95\.232\.26)|1\.(?:139\.50\.41|2\.98\.206)|2\.237\.78\.177)|4\.1(?:56\.108\.188|99\.205\.252))|1(?:9(?:0\.(?:196\.13\.66|6\.172\.98)|5\.1(?:89\.45\.11|61\.9\.2)|3\.108\.38\.228)|2(?:1\.1(?:0\.127\.158|87\.85\.114)|2\.252\.234\.74|4\.124\.52\.162)|1(?:3\.160\.248\.101|1\.68\.111\.195|6\.50\.249\.2)|74\.(?:143\.151\.(?:65|80)|36\.201\.222)|40\.113\.121\.101)|9(?:4\.(?:2(?:3\.(?:(?:215\.5|35\.18)0|45\.154|5\.161)|51\.113\.140)|159\.202\.199)|1\.1(?:21\.(?:14(?:8\.189|\.198)|8(?:1\.99|3\.5)|23\.205)|92\.144\.9)|2\.243\.17\.217|3\.122\.135\.4|5\.86\.78\.80)|6(?:1\.1(?:48\.102\.110|78\.126\.206)|2\.1(?:69\.150\.234|48\.88\.98)|6\.(?:2
42\.25\.198|49\.137\.29)|5\.204\.173\.139|7\.225\.179\.86)|8(?:9\.(?:190\.197\.14|97\.183\.195)|0\.235\.105\.140|2\.239\.205\.187|3\.143\.151\.165|4\.17\.11\.114|5\.192\.33\.96)|7(?:4\.(?:208\.167\.189|50\.85\.108)|5\.126\.49\.149|0\.38\.54\.133|7\.70\.54\.81|2\.21\.6\.17)|5(?:8\.18\.168\.16[35]|9\.160\.177\.27))\b)/
#describe KHOP_SC_TOP100 Relay listed in SpamCop top 100 spammer IPs
#score KHOP_SC_TOP100 1.4 1.3 1.8 1.7
# http://ruleqa.spamassassin.org/week/KHOP_SC_TOP100/detail
@@ -95,12 +95,12 @@
# notable overlap: 98% of hits also hit RCVD_IN_XBL (3.033)
# notable overlap: 80% of hits also hit RCVD_IN_SORBS_WEB (0.619)
-#header KHOP_SC_TOP20 Received =~ /(?-xism:\b(?:1(?:1(?:1\.224\.250\.64|7\.25\.129\.200)|95\.161\.9\.2)|200\.(?:216\.152\.210|141\.87\.135|80\.140\.61)|58\.18\.168\.16[23]|61\.158\.163\.112|80\.93\.125\.186)\b)/
+#header KHOP_SC_TOP20 Received =~ /(?-xism:\b(?:2(?:00\.(?:216\.152\.210|141\.87\.135|80\.140\.61)|22\.252\.223\.2)|1(?:1(?:1\.224\.250\.133|7\.25\.129\.200)|25\.46\.73\.179)|(?:61\.158\.163\.11|58\.18\.168\.16)2|80\.93\.125\.186)\b)/
#describe KHOP_SC_TOP20 Relay listed in SpamCop top 20 spammer IPs
#score KHOP_SC_TOP20 1.9 1.7 2.2 2.0
# assumed overlap: 99+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)
-#header KHOP_SC_TOP10 Received =~ /(?-xism:\b(?:2(?:1(?:3\.227\.219\.58|9\.254\.35\.45)|09\.94\.196\.170|22\.252\.223\.2)|(?:58\.18\.168\.16|84\.22\.140\.18)6|6(?:0\.213\.48\.25|1\.178\.81\.10)0|111\.224\.250\.(?:67|70))\b)/
+#header KHOP_SC_TOP10 Received =~ /(?-xism:\b(?:2(?:1(?:3\.227\.219\.58|9\.254\.35\.45)|09\.94\.196\.170)|(?:58\.18\.168\.16|84\.22\.140\.18)6|6(?:0\.213\.48\.25|1\.178\.81\.10)0|111\.224\.250\.(?:67|70)|91\.132\.70\.11)\b)/
#describe KHOP_SC_TOP10 Relay listed in SpamCop top 10 spammer IPs
#score KHOP_SC_TOP10 2.2 2.0 2.6 2.4
# assumed overlap: 99+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf?rev=883193&r1=883192&r2=883193&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf Sun Nov 22 23:56:17 2009
@@ -5,39 +5,39 @@
# With RDNS_DYNAMIC, this represents a decent poor-man's botnet detector
-meta S25R_0 !__NOT_SPOOFED && !__GREYLISTED && RDNS_NONE
-describe S25R_0 S25R Rule 0: Reverse lookup failure
+meta S25R_0 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && RDNS_NONE
+describe S25R_0 S25R: Reverse lookup failure
score S25R_0 0.1
tflags S25R_0 nopublish
# still trying to figure out whether to push this or just let RDNS_NONE do it.
header __S25R_1 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=[^. ]*\d[^0-9. ]+\d\S*\./
-describe S25R_1 S25R Rule 1: Bottom of rDNS has num, non-num, num
-meta S25R_1 !__NOT_SPOOFED && !__GREYLISTED && __S25R_1
+describe S25R_1 S25R: Bottom of rDNS has num, non-num, num
+meta S25R_1 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_1
score S25R_1 0.1
header __S25R_2 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=[^. ]*\d{5}/
-describe S25R_2 S25R Rule 2: Bottom of rDNS has 5+ digits in a row
-meta S25R_2 !__NOT_SPOOFED && !__GREYLISTED && __S25R_2
+describe S25R_2 S25R: Bottom of rDNS has 5+ digits in a row
+meta S25R_2 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_2
score S25R_2 0.1
header __S25R_3 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=(?:[^. ]+\.)?\d[^. ]*\.[^. ]+\.\S+\.[a-z]/
-describe S25R_3 S25R Rule 3: A low-level of rDNS starts w/ a number
-meta S25R_3 !__NOT_SPOOFED && !__GREYLISTED && __S25R_3
+describe S25R_3 S25R: A low-level of rDNS starts w/ a number
+meta S25R_3 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_3
score S25R_3 0.1
header __S25R_4 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=[^. ]*\d\.[^. ]*\d-\d/
-describe S25R_4 S25R Rule 4: Bottom of rDNS ends w/ num, next lvl has num-num
-meta S25R_4 !__NOT_SPOOFED && !__GREYLISTED && __S25R_4
+describe S25R_4 S25R: Bottom of rDNS ends w/ num, next lvl has num-num
+meta S25R_4 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_4
score S25R_4 0.1
header __S25R_5 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=[^. ]*\d\.[^. ]*\d\.[^. ]+\.\S+\./
-describe S25R_5 S25R Rule 5: rDNS has 5+ layers, bottom 2 end in numbers
-meta S25R_5 !__NOT_SPOOFED && !__GREYLISTED && __S25R_5
+describe S25R_5 S25R: rDNS has 5+ layers, bottom 2 end in numbers
+meta S25R_5 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_5
score S25R_5 0.1
header __S25R_6 X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=(?:dhcp|dialup|ppp|[achrsvx]?dsl)[^. ]*\d/
-describe S25R_6 S25R Rule 6: rDNS looks dynamic or customer-facing
-meta S25R_6 !__NOT_SPOOFED && !__GREYLISTED && __S25R_6
+describe S25R_6 S25R: rDNS looks dynamic or customer-facing
+meta S25R_6 __LAST_EXTERNAL_RELAY_NO_AUTH && !__NOT_SPOOFED && !__GREYLISTED && __S25R_6
score S25R_6 0.1