You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2009/10/04 00:59:08 UTC
svn commit: r821441 -
/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Author: jhardin
Date: Sat Oct 3 22:59:08 2009
New Revision: 821441
URL: http://svn.apache.org/viewvc?rev=821441&view=rev
Log:
refinements of CN_EIGHT per list discussion
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=821441&r1=821440&r2=821441&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Sat Oct 3 22:59:08 2009
@@ -158,7 +158,18 @@
describe MANY_SUBDOM Lots and lots of subdomain parts in a URI
# 8-letter .cn domain, per Warren Togami
-uri CN_EIGHT m;^https?://(?:[^./]+\.)*[^./]{8}\.cn\b;
-describe CN_EIGHT .CN uri with eight-letter domain name
+#uri CN_EIGHT m;^https?://(?:[^./]+\.)*[^./]{8}\.cn\b;
+uri CN_EIGHT m;^https?://(?:[^./]+\.)*\w{8}\.cn\b;
+describe CN_EIGHT .cn URI with eight-character domain name
score CN_EIGHT 0.10
+# Testing for WT
+# from http://www.apnic.net/db/ranges.html at 20091002, meta bits added 20090930
+# copied from khop-bl.sa.khopesh.com
+header __RCVD_VIA_APNIC Received =~ /(?-xism:[^0-9.](?:2(?:0(?:2(?:\.1(?:2(?:3\.(?:0?(?:[4-9][0-9]|3[2-9])|[12][0-9]{2})\.[012]?[0-9]{1,2}|[^3]\.(?:012]?[0-9]{1,2}){2})|[^2]3\.(?:012]?[0-9]{1,2}){2})|(?:\.[02]?[0-9]{1,2}){3})|3(?:\.[012]?[0-9]{1,2}){3})|(?:1[0189]|2[012])(?:\.[012]?[0-9]{1,2}){3})|1(?:(?:2[0123456]|8[023]|1\d|75)(?:\.[012]?[0-9]{1,2}){3}|69\.2(?:1[0-9]|2[0-3]|0[89])(?:\.[012]?[0-9]{1,2}){2})|(?:5[89]|6[01])(?:\.[012]?[0-9]{1,2}){3})(?:[\]\)\s]))/
+describe __RCVD_VIA_APNIC Received through a relay in Asia/Pacific Network
+
+meta CN_EIGHT_NOAPNIC CN_EIGHT && !__RCVD_VIA_APNIC && !ALL_TRUSTED
+describe CN_EIGHT_NOAPNIC .cn URI exactly 8 characters long, excluding APNIC
+
+