Merge branch 'master' into patch-7

2 files changed, 113 insertions, 3 deletions

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index c3594dbc9..d8db05ecc 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -79,9 +79,29 @@ rbl {
     }
 
     senderscore {
-      symbol = "RBL_SENDERSCORE";
+      symbol = "RBL_SENDERSCORE_UNKNOWN";
       checks = ['from'];
       rbl = "bl.score.senderscore.com";
+      returncodes {
+        RBL_SENDERSCORE_BOT = "127.0.0.1";
+        RBL_SENDERSCORE_NA = "127.0.0.2";
+        RBL_SENDERSCORE_NA_BOT = "127.0.0.3";
+        RBL_SENDERSCORE_PRST = "127.0.0.4";
+        RBL_SENDERSCORE_PRST_BOT = "127.0.0.5";
+        RBL_SENDERSCORE_PRST_NA = "127.0.0.6";
+        RBL_SENDERSCORE_PRST_NA_BOT = "127.0.0.7";
+        RBL_SENDERSCORE_SUS_ATT = "127.0.0.8";
+        RBL_SENDERSCORE_SUS_ATT_NA = "127.0.0.10";
+        RBL_SENDERSCORE_SUS_ATT_NA_BOT = "127.0.0.11";
+        RBL_SENDERSCORE_SUS_ATT_PRST_NA = "127.0.0.14";
+        RBL_SENDERSCORE_SUS_ATT_PRST_NA_BOT = "127.0.0.15";
+        RBL_SENDERSCORE_SCORE = "127.0.0.16";
+        RBL_SENDERSCORE_SCORE_NA = "127.0.0.18";
+        RBL_SENDERSCORE_SCORE_PRST = "127.0.0.20";
+        RBL_SENDERSCORE_SCORE_PRST_NA = "127.0.0.22";
+        RBL_SENDERSCORE_SCORE_SUS_ATT_NA = "127.0.0.26";
+        RBL_SENDERSCORE_BLOCKED = "127.255.255.255";
+      }
     }
 
     sem {
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index ef29ed2fa..741552a17 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -162,9 +162,99 @@ symbols = {
         groups = ["spamhaus", "blocked"];
     }
 
-    "RBL_SENDERSCORE" {
+    "RBL_SENDERSCORE_UNKNOWN" {
+        weight = 0.0;
+        description = "Unrecognised result from SenderScore RPBL";
+    }
+    "RBL_SENDERSCORE_BOT" {
+        weight = 2.0;
+        description = "From address is listed in SenderScore RPBL - botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_NA" {
+        weight = 0.0;
+        description = "From address is listed in SenderScore RPBL - noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_NA_BOT" {
+        weight = 1.0;
+        description = "From address is listed in SenderScore RPBL - noauth+botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_PRST" {
+        weight = 2.0;
+        description = "From address is listed in SenderScore RPBL - pristine";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_PRST_BOT" {
+        weight = 3.0;
+        description = "From address is listed in SenderScore RPBL - pristine+botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_PRST_NA" {
         weight = 2.0;
-        description = "From address is listed in senderscore.com BL";
+        description = "From address is listed in SenderScore RPBL - pristine+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_PRST_NA_BOT" {
+        weight = 3.0;
+        description = "From address is listed in SenderScore RPBL - pristine+noauth+botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SUS_ATT" {
+        weight = 1.0;
+        description = "From address is listed in SenderScore RPBL - suspect_attachments";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SUS_ATT_NA" {
+        weight = 1.0;
+        description = "From address is listed in SenderScore RPBL - suspect_attachments+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SUS_ATT_NA_BOT" {
+        weight = 1.5;
+        description = "From address is listed in SenderScore RPBL - suspect_attachments+noauth+botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SUS_ATT_PRST_NA" {
+        weight = 3.0;
+        description = "From address is listed in SenderScore RPBL - suspect_attachments+pristine+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SUS_ATT_PRST_NA_BOT" {
+        weight = 3.5;
+        description = "From address is listed in SenderScore RPBL - suspect_attachments+pristine+noauth+botnet";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SCORE" {
+        weight = 2.0;
+        description = "From address is listed in SenderScore RPBL - sender_score";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SCORE_NA" {
+        weight = 2.0;
+        description = "From address is listed in SenderScore RPBL - sender_score+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SCORE_PRST" {
+        weight = 4.0;
+        description = "From address is listed in SenderScore RPBL - sender_score+pristine";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SCORE_PRST_NA" {
+        weight = 4.0;
+        description = "From address is listed in SenderScore RPBL - sender_score+pristine+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_SCORE_SUS_ATT_NA" {
+        weight = 3.0;
+        description = "From address is listed in SenderScore RPBL - sender_score+suspect_attachments+noauth";
+        groups = ["senderscore"];
+    }
+    "RBL_SENDERSCORE_BLOCKED" {
+        weight = 0.0;
+        description = "Excessive number of queries to SenderScore RPBL, more info: https://knowledge.validity.com/hc/en-us/articles/20961730681243";
+        groups = ["senderscore", "blocked"];
     }
 
     "MAILSPIKE" {