From 993c4a75520121da554575b9abbbd140825a5855 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 29 Oct 2018 17:41:17 +0000
Subject: [PATCH] [Conf] Add DWL support in the default configuration

---
 conf/modules.d/rbl.conf      | 19 ++++++++++++++++++-
 conf/scores.d/rbl_group.conf | 26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 27db68f71..17d76aed9 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -126,7 +126,7 @@ rbl {
             }
         }
 
-	nixspam {
+        nixspam {
             symbol = "RBL_NIXSPAM";
             rbl = "ix.dnsbl.manitu.net";
             ipv6 = true;
@@ -146,6 +146,23 @@ rbl {
             from = false;
             ignore_whitelists = true;
         }
+
+        dnswl_dwl {
+          symbol = "DWL_DNSWL";
+          rbl = "dwl.dnswl.org";
+          dkim = true;
+          dkim_domainonly = false;
+          dkim_match_from = true;
+          unknown = false;
+
+          returncodes {
+              DWL_DNSWL_NONE = "127.0.%d+.0";
+              DWL_DNSWL_LOW = "127.0.%d+.1";
+              DWL_DNSWL_MED = "127.0.%d+.2";
+              DWL_DNSWL_HI = "127.0.%d+.3";
+              DWL_DNSWL_BLOCKED = "127.0.0.255";
+          }
+        }
     }
 
     .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index bc9bb6b0e..f40d94e7f 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -16,6 +16,7 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 symbols = {
+
     "DNSWL_BLOCKED" {
         weight = 0.0;
         description = "Resolver blocked due to excessive queries";
@@ -41,6 +42,31 @@ symbols = {
         description = "Sender listed at https://www.dnswl.org, high trust";
     }
 
+    "DNSWL_DWL_BLOCKED" {
+        weight = 0.0;
+        description = "Resolver blocked due to excessive queries (dwl)";
+    }
+    "DWL_DNSWL" {
+        weight = 0.0;
+        description = "Unrecognised result from https://www.dnswl.org (dwl)";
+    }
+    "DWL_DNSWL_NONE" {
+        weight = 0.0;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, no trust";
+    }
+    "DWL_DNSWL_LOW" {
+        weight = -1;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, low trust";
+    }
+    "DWL_DNSWL_MED" {
+        weight = -2;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, medium trust";
+    }
+    "DWL_DNSWL_HI" {
+        weight = -3.5;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, high trust";
+    }
+
     "RBL_SPAMHAUS" {
         weight = 0.0;
         description = "Unrecognised result from Spamhaus ZEN";
-- 
2.39.5