RBL: change behaviour of whitelists

2 files changed, 29 insertions, 25 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 49266e7ae..2ebd20479 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -342,10 +342,10 @@ metric {
     symbol { name = "RECEIVED_SPAMHAUS_XBL"; weight = 3.0; description = "Received address is listed in zen pbl"; one_shot = true; }
     
     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 { name = "RWL_SPAMHAUS_WL_IND"; weight = 0.0; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_TRANS"; weight = 0.0; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_IND_EXP"; weight = 0.0; description = "Sender listed at Spamhaus whitelist"; }
+    symbol { name = "RWL_SPAMHAUS_WL_TRANS_EXP"; weight = 0.0; description = "Sender listed at Spamhaus whitelist"; }
     
     symbol {
         weight = 2.0;
@@ -363,16 +363,14 @@ metric {
         name = "RBL_UCEPROTECT_LEVEL1";
     }
     
-    symbol { name = "RBL_MAILSPIKE"; weight = 0.0; description = "From address is listed in RBL"; }
+    symbol { name = "RBL_MAILSPIKE_ZOMBIE"; weight = 2.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 { name = "RWL_MAILSPIKE_POSSIBLE"; weight = 0.0; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_GOOD"; weight = 0.0; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_VERYGOOD"; weight = 0.0; description = "From address is listed in RWL"; }
+    symbol { name = "RWL_MAILSPIKE_EXCELLENT"; weight = 0.0; description = "From address is listed in RWL"; }
 	
     symbol {
         weight = 1.0;
diff --git a/conf/modules.conf b/conf/modules.conf
index 413e7e00b..6d2822cca 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -120,6 +120,7 @@ rbl {
         symbol = "RWL_SPAMHAUS_WL";
         rbl = "swl.spamhaus.org";
         ipv6 = true;
+        is_whitelist = true;
         returncodes {
             RWL_SPAMHAUS_WL_IND = "127.0.2.2";
             RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
@@ -128,20 +129,23 @@ rbl {
         }
     }
 
-    mailspike {
-       symbol = "RBL_MAILSPIKE";
-       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"
+    mailspike_bl {
+       rbl = "bl.mailspike.net";
+       returncodes {
+            RBL_MAILSPIKE_ZOMBIE = "127.0.0.2";
+            RBL_MAILSPIKE_WORST = "127.0.0.10";
+            RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
+            RBL_MAILSPIKE_BAD = "127.0.0.12";
+       }
+    }
+
+    mailspike_wl {
+       rbl = "wl.mailspike.net";
+       returncodes {
+            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";
          }
     }
     
@@ -193,6 +197,7 @@ rbl {
         symbol = "RCVD_IN_DNSWL";
         rbl = "list.dnswl.org";
         ipv6 = true;
+        is_whitelist = true;
         returncodes {
             RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
             RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
@@ -210,6 +215,7 @@ rbl {
         exclude_users = false;
         exclude_private_ips = false;
         exclude_local = false;
+        ignore_whitelists = true;
     }
 
  }