Merge pull request #74 from AlexeySa/master

Fix: Change rbl logic

3 files changed, 52 insertions, 14 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index ba6669ff4..6cacf4b29 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -340,6 +340,16 @@ metric {
         name = "RBL_SENDERSCORE";
     }
     symbol {
+        weight = 1.0;
+        description = "From address is listed in ABUSE.CH BL";
+        name = "RBL_ABUSECH";
+    }
+    symbol {
+        weight = 1.0;
+        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";
@@ -395,8 +405,23 @@ metric {
         description = "List of networks hijacked from their original owners, some of which have already used for spamming.";
     }
     
-    symbol { name = "RBL_SEM_UNKNOWN"; weight = 0.0; description = "Address is listed in Spameatingmonkey RBL"; }
-    symbol { name = "RBL_SEM"; weight = 1.0; description = "Address is listed in Spameatingmonkey RBL"; }
+    symbol {
+        weight = 1.0; 
+        name = "RBL_SEM";
+        description = "Address is listed in Spameatingmonkey RBL";
+    }
+    
+    symbol {
+        weight = 1.0; 
+        name = "RBL_NSZONES";
+        description = "Address is listed in Nszones RBL";
+    }
+    
+    symbol {
+        weight = 1.0; 
+        name = "RBL_ABUSEAT";
+        description = "Address is listed in Abuseat RBL";
+    }
     
     symbol {
         weight = 3.0;
diff --git a/conf/modules.conf b/conf/modules.conf
index 6cc0c7d15..d7f396b47 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -113,10 +113,22 @@ rbl {
        symbol = "RBL_MAILSPIKE";
        rbl = "bl.mailspike.net";
     }
+    
     senderscore {
        symbol = "RBL_SENDERSCORE";
        rbl = "bl.score.senderscore.com";
     }
+    
+    abusech {
+       symbol = "RBL_ABUSECH";
+       rbl = "spam.abuse.ch";
+    }
+    
+    uceprotect1 {
+       symbol = "RBL_UCEPROTECT_LEVEL1";
+       rbl = "dnsbl-1.uceprotect.net";
+    }
+    
     sorbs {
        symbol = "RBL_SORBS";
        rbl = "dnsbl.sorbs.net";
@@ -135,22 +147,23 @@ rbl {
     }
     
     sem {
-        symbol = "RBL_SEM_UNKNOWN";
+        symbol = "RBL_SEM";
         rbl = "bl.spameatingmonkey.net";
-        ipv4 = true;
-        ipv6 = false;
-        unknown = false;
-        returncodes {
-            RBL_SEM = "127.0.0.2";
-        }
+    }
+    
+    nszones {
+       symbol = "RBL_NSZONES";
+       rbl = "sbl.nszones.com";
+    }
+
+    abuseat {
+       symbol = "RBL_ABUSEAT";
+       rbl = "cbl.abuseat.org";
     }
 
     dnswl {
         symbol = "RCVD_IN_DNSWL";
         rbl = "list.dnswl.org";
-        ipv4 = true;
-        ipv6 = false;
-        received = false;
         unknown = true;
         returncodes {
             RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index cef48f8b6..bdfe3500b 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -120,10 +120,10 @@ if(opts['default_ipv6'] == nil) then
 	opts['default_ipv6'] = false
 end
 if(opts['default_received'] == nil) then
-	opts['default_received'] = true 
+	opts['default_received'] = false
 end
 if(opts['default_from'] == nil) then
-	opts['default_from'] = false
+	opts['default_from'] = true
 end
 if(opts['default_unknown'] == nil) then
 	opts['default_unknown'] = false