2 files changed, 97 insertions, 2 deletions
diff --git a/conf/scores.d/policies_group.conf b/conf/scores.d/policies_group.conf
index 4a8bdb6b7..712c61523 100644
--- a/conf/scores.d/policies_group.conf
+++ b/conf/scores.d/policies_group.conf
@@ -55,6 +55,11 @@ symbols = {
         description = "SPF record is malformed or persistent DNS error";
         groups = ["spf"];
     }
+    "R_SPF_PLUSALL" {
+        weight = 4.0;
+        description = "SPF record allows to send from any IP";
+        groups = ["spf"];
+    }
 
     # DKIM
     "R_DKIM_REJECT" {
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" {