Merge pull request #76 from AlexeySa/master

Some adding for RBL and SURBL

3 files changed, 257 insertions, 8 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 6cacf4b29..7a735f839 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -324,6 +324,7 @@ metric {
     }
 
     symbol { name = "RCVD_IN_DNSWL"; weight = 0.0; description = "Sender listed at http://www.dnswl.org"; }
+    symbol { name = "RCVD_IN_DNSWL_NONE"; weight = -0.05; description = "Sender listed at http://www.dnswl.org, low none"; }
     symbol { name = "RCVD_IN_DNSWL_LOW"; weight = -0.1; description = "Sender listed at http://www.dnswl.org, low trust"; }
     symbol { name = "RCVD_IN_DNSWL_MED"; weight = -1.0; description = "Sender listed at http://www.dnswl.org, medium trust"; }
     symbol { name = "RCVD_IN_DNSWL_HI"; weight = -5.0; description = "Sender listed at http://www.dnswl.org, high trust"; }
@@ -334,6 +335,13 @@ metric {
     symbol { name = "RBL_SPAMHAUS_XBL"; weight = 4.0; description = "From address is listed in zen xbl"; }
     symbol { name = "RBL_SPAMHAUS_PBL"; weight = 2.0; description = "From address is listed in zen pbl"; }
     symbol { name = "RECEIVED_SPAMHAUS_XBL"; weight = 3.0; description = "Received address is listed in zen pbl"; }
+    
+    symbol { name = "RWL_SPAMHAUS_WL"; weight = 0.0; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_IND"; weight = -0.7; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_TRANS"; weight = -0.6; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_IND_EXP"; weight = -0.3; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_TRANS_EXP"; weight = -0.2; description = "Sender listed at Spamhaus whitelist"; }
+    
     symbol {
         weight = 2.0;
         description = "From address is listed in senderscore.com BL";
@@ -349,11 +357,18 @@ metric {
         description = "From address is listed in UCEPROTECT LEVEL1 BL";
         name = "RBL_UCEPROTECT_LEVEL1";
     }
-    symbol {
-        weight = 2.0;
-        description = "From address is listed in mailspike.com BL";
-        name = "RBL_MAILSPIKE";
-    }
+    
+    symbol { name = "RBL_MAILSPIKE"; weight = 0.0; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_WORST"; weight = 2.0; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_VERYBAD"; weight = 1.5; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_BAD"; weight = 1.0; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_SUSP"; weight = 0.5; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_PROB"; weight = 0.3; description = "From address is listed in RBL"; }
+    symbol { name = "RWL_MAILSPIKE_POSSIBLE"; weight = -0.2; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_GOOD"; weight = -0.5; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_VERYGOOD"; weight = -0.6; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_EXCELLENT"; weight = -0.7; description = "From address is listed in RWL"; }
+	
     symbol {
         weight = 1.0;
         name = "RBL_SORBS";
@@ -413,6 +428,12 @@ metric {
     
     symbol {
         weight = 1.0; 
+        name = "RBL_SEM_IPV6;
+        description = "Address is listed in Spameatingmonkey RBL (ipv6)";
+    }
+    
+    symbol {
+        weight = 1.0; 
         name = "RBL_NSZONES";
         description = "Address is listed in Nszones RBL";
     }
diff --git a/conf/modules.conf b/conf/modules.conf
index 57ff855c2..160680fd2 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -108,10 +108,33 @@ rbl {
        received = true;
        from = false;
     }
+    
+    spamhaus_swl {
+        symbol = "RWL_SPAMHAUS_WL";
+        rbl = "swl.spamhaus.org";
+        returncodes {
+            RWL_SPAMHAUS_WL_IND = "127.0.2.2";
+            RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
+            RWL_SPAMHAUS_WL_IND_EXP = "127.0.2.102";
+            RWL_SPAMHAUS_WL_TRANS_EXP = "127.0.2.103";
+        }
+    }
 
     mailspike {
        symbol = "RBL_MAILSPIKE";
-       rbl = "bl.mailspike.net";
+       rbl = "rep.mailspike.net";
+         returncodes {
+            #http://mailspike.net/usage.html
+            RBL_MAILSPIKE_WORST = "127.0.0.10"
+            RBL_MAILSPIKE_VERYBAD = "127.0.0.11"
+            RBL_MAILSPIKE_BAD = "127.0.0.12"
+            RBL_MAILSPIKE_SUSP = "127.0.0.13"
+            RBL_MAILSPIKE_PROB = "127.0.0.14"
+            RWL_MAILSPIKE_POSSIBLE = "127.0.0.17"
+            RWL_MAILSPIKE_GOOD = "127.0.0.18"
+            RWL_MAILSPIKE_VERYGOOD = "127.0.0.19"
+            RWL_MAILSPIKE_EXCELLENT = "127.0.0.20"
+         }
     }
     
     senderscore {
@@ -151,6 +174,13 @@ rbl {
         rbl = "bl.spameatingmonkey.net";
     }
     
+    semIPv6 {
+        symbol = "RBL_SEM_IPV6";
+        rbl = "bl.ipv6.spameatingmonkey.net";
+        ipv4 = false;
+        ipv6 = true;
+    }
+    
     nszones {
        symbol = "RBL_NSZONES";
        rbl = "sbl.nszones.com";
@@ -164,8 +194,8 @@ rbl {
     dnswl {
         symbol = "RCVD_IN_DNSWL";
         rbl = "list.dnswl.org";
-        unknown = true;
         returncodes {
+            RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
             RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
             RCVD_IN_DNSWL_MED = "127.0.%d+.2";
             RCVD_IN_DNSWL_HI  = "127.0.%d+.3";
diff --git a/conf/surbl-whitelist.inc b/conf/surbl-whitelist.inc
index de0dfa41e..2b7464ed4 100644
--- a/conf/surbl-whitelist.inc
+++ b/conf/surbl-whitelist.inc
@@ -1,5 +1,5 @@
 #
-# $Id: rspamd-whitelist.conf,v 1.1 2009/06/11 12:25:37 dmx Exp $
+# $Id: rspamd-whitelist.conf,v 1.1 2014/05/23 13:35:37 dmx Exp $
 #
 1gost.info
 autorambler.ru
@@ -21,3 +21,201 @@ yandex.ru
 yandex.net
 youtube.com
 walmart.com
+example.com
+example.net
+example.org
+126.com
+163.com
+2o7.net
+4at1.com
+5iantlavalamp.com
+about.com
+adelphia.net
+adobe.com
+agora-inc.com
+agoramedia.com
+akamai.net
+akamaitech.net
+amazon.com
+ancestry.com
+aol.com
+apache.org
+apple.com
+arcamax.com
+astrology.com
+atdmt.com
+att.net
+bbc.co.uk
+bcentral.com
+bellsouth.net
+bfi0.com
+bridgetrack.com
+cafe24.com
+charter.net
+citibank.com
+citizensbank.com
+cjb.net
+classmates.com
+clickbank.net
+cnet.com
+cnn.com
+com.com
+com.ne.kr
+comcast.net
+corporate-ir.net
+cox.net
+cs.com
+custhelp.com
+daum.net
+dd.se
+debian.org
+dell.com
+directtrack.com
+directnic.com
+domain.com
+dsbl.org
+earthlink.net
+ebay.co.uk
+ebay.com
+ebayimg.com
+ebaystatic.com
+edgesuite.net
+ediets.com
+egroups.com
+emode.com
+excite.com
+f-secure.com
+free.fr
+freebsd.org
+gentoo.org
+geocities.com
+gmail.com
+gmx.net
+go.com
+google.com
+googleadservices.com
+grisoft.com
+hallmark.com
+hinet.net
+hotbar.com
+hotmail.com
+hotpop.com
+hp.com
+ibm.com
+incredimail.com
+investorplace.com
+ivillage.com
+joingevalia.com
+juno.com
+kernel.org
+livejournal.com
+lycos.com
+m7z.net
+mac.com
+macromedia.com
+mail.com
+mail.ru
+mailscanner.info
+marketwatch.com
+mcafee.com
+mchsi.com
+messagelabs.com
+microsoft.com
+military.com
+mindspring.com
+mit.edu
+monster.com
+msn.com
+nate.com
+netflix.com
+netscape.com
+netscape.net
+netzero.net
+norman.com
+nytimes.com
+optonline.net
+osdn.com
+overstock.com
+pacbell.net
+pandasoftware.com
+paypal.com
+peoplepc.com
+plaxo.com
+prodigy.net
+radaruol.com.br
+real.com
+redhat.com
+regions.com
+regionsnet.com
+rogers.com
+rr.com
+sbcglobal.net
+sec.gov
+sf.net
+shaw.ca
+shockwave.com
+smithbarney.com
+sourceforge.net
+spamcop.net
+speedera.net
+sportsline.com
+sun.com
+suntrust.com
+sympatico.ca
+t-online.de
+tails.nl
+telus.net
+terra.com.br
+ticketmaster.com
+tinyurl.com
+tiscali.co.uk
+tom.com
+tone.co.nz
+tux.org
+uol.com.br
+ups.com
+verizon.net
+w3.org
+wamu.com
+wanadoo.fr
+washingtonpost.com
+weatherbug.com
+web.de
+webshots.com
+webtv.net
+wsj.com
+yahoo.ca
+yahoo.co.kr
+yahoo.co.uk
+yahoo.com
+yahoo.com.br
+yahoogroups.com
+yimg.com
+yopi.de
+yoursite.com
+zdnet.com
+openxmlformats.org
+passport.com
+xmlsoap.org
+alexa.com
+ask.com
+baidu.com
+bing.com
+craigslist.org
+doubleclick.com
+ebay.de
+facebook.com
+flickr.com
+godaddy.com
+google.co.in
+google.it
+mozilla.com
+myspace.com
+rediff.com
+twitter.com
+wordpress.com
+yahoo.co.jp
+youtube.com
+fedex.com
+openoffice.org
+