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/10/05 21:00:36 UTC

svn commit: r1842984 - /spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf

Author: hege
Date: Fri Oct  5 21:00:36 2018
New Revision: 1842984

URL: http://svn.apache.org/viewvc?rev=1842984&view=rev
Log:
More X-Originating-IP stuff

Modified:
    spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf

Modified: spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf?rev=1842984&r1=1842983&r2=1842984&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf Fri Oct  5 21:00:36 2018
@@ -3,15 +3,18 @@
 #### Basic stuff
 ####
 
-header		HK_XOIP_4SINGLES	X-Originating-IP =~ /^\d\.\d\.\d\.\d$/
+header		HK_XOIP_4SINGLES	X-Originating-IP =~ /^\[?\d\.\d\.\d\.\d\]?$/
 score		HK_XOIP_3SINGLES	1
 
-header		HK_XOIP_3SINGLES	X-Originating-IP =~ /^(?:\d\d+\.\d\.\d\.\d|\d\.\d\d+\.\d\.\d|\d\.\d\.\d\d+\.\d|\d\.\d\.\d\.\d\d+)$/
+header		HK_XOIP_3SINGLES	X-Originating-IP =~ /^\[?(?:\d\d+\.\d\.\d\.\d|\d\.\d\d+\.\d\.\d|\d\.\d\.\d\d+\.\d|\d\.\d\.\d\.\d\d+)\]?$/
 score		HK_XOIP_3SINGLES	1
 
-header		HK_XOIP_0FRONT		X-Originating-IP =~ /(?:^|\.)0[1-9]/
+header		HK_XOIP_0FRONT		X-Originating-IP =~ /(?:^\[?|\.)0[1-9]/
 score		HK_XOIP_0FRONT		1
 
+header		HK_XOIP_0		X-Originating-IP =~ /(?:^\[?|\.)0+\./
+score		HK_XOIP_0		1
+
 header		HK_EMPTY_DKIM_S		DKIM-Signature =~ /[\s;]s=\s*;/
 score		HK_EMPTY_DKIM_S		1