From 198a5e7bca4406bcbf22d879cb46e3f39347688c Mon Sep 17 00:00:00 2001
From: georglauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:42:07 +0100
Subject: [PATCH] Revert "Rspamd: add custom symbol scores for SPF, DKIM &
 DMARC (#3726)"

This reverts commit 71a5a2af28550aa7dfbf9381aa5fa0fb773a0364.
---
 CHANGELOG.md                               |   2 -
 Dockerfile                                 |   1 -
 target/rspamd/local.d/actions.conf         |  11 +--
 target/rspamd/scores.d/policies_group.conf | 108 ---------------------
 4 files changed, 4 insertions(+), 118 deletions(-)
 delete mode 100644 target/rspamd/scores.d/policies_group.conf

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d9ca4ab..13f371c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Updates
 
-- **Rspamd** ([#3726](https://github.com/docker-mailserver/docker-mailserver/pull/3726)):
-  - symbol scores for SPF, DKIM & DMARC were updated to more closely align with [RFC7489](https://www.rfc-editor.org/rfc/rfc7489#page-24); please note though that complete alignment is undesirable, because other symbols might be added as well, which changes the overall score calculation again, see [this issue](https://github.com/docker-mailserver/docker-mailserver/issues/3690#issuecomment-1866871996)
 - **Tests**:
   - existing tests were streamlined and simplified, which is a follow-up of [#3732](https://github.com/docker-mailserver/docker-mailserver/pull/3732)
 
diff --git a/Dockerfile b/Dockerfile
index f9802c2a..4d0e3568 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,7 +106,6 @@ EOF
 # -----------------------------------------------
 
 COPY target/rspamd/local.d/ /etc/rspamd/local.d/
-COPY target/rspamd/scores.d/* /etc/rspamd/scores.d/
 
 # -----------------------------------------------
 # --- LDAP & SpamAssassin's Cron ----------------
diff --git a/target/rspamd/local.d/actions.conf b/target/rspamd/local.d/actions.conf
index fb4c15b9..b214c339 100644
--- a/target/rspamd/local.d/actions.conf
+++ b/target/rspamd/local.d/actions.conf
@@ -1,12 +1,9 @@
 # documentation: https://rspamd.com/doc/configuration/metrics.html#actions
 # and            https://rspamd.com/doc/configuration/metrics.html
 
-# These values work in conjunction with the symbol scores in
-# `scores.d/*.conf`. When adjusting them, make sure to understand
-# and to be able to explain the impact on the whole system.
-greylist = 4;
-add_header = 6;
-rewrite_subject = 7;
-reject = 11;
+#greylist = 4;
+#add_header = 6;
+#rewrite_subject = 7;
+#reject = 15;
 
 subject = "***SPAM*** %s"
diff --git a/target/rspamd/scores.d/policies_group.conf b/target/rspamd/scores.d/policies_group.conf
deleted file mode 100644
index 5f9426e9..00000000
--- a/target/rspamd/scores.d/policies_group.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-# Please refer to
-# https://github.com/docker-mailserver/docker-mailserver/issues/3690
-# for understanding this file and its scores' values.
-
-symbols = {
-    # SPF
-    "R_SPF_ALLOW" {
-        weight = -1;
-        description = "SPF verification allows sending";
-        groups = ["spf"];
-    }
-    "R_SPF_NA" {
-        weight = 1.5;
-        description = "Missing SPF record";
-        one_shot = true;
-        groups = ["spf"];
-    }
-    "R_SPF_SOFTFAIL" {
-        weight = 2.5;
-        description = "SPF verification soft-failed";
-        groups = ["spf"];
-    }
-    "R_SPF_FAIL" {
-        weight = 4.5;
-        description = "SPF verification failed";
-        groups = ["spf"];
-    }
-
-    "R_SPF_NEUTRAL" { # == R_SPF_NA
-        weight = 1.5;
-        description = "SPF policy is neutral";
-        groups = ["spf"];
-    }
-    "R_SPF_DNSFAIL" { # == R_SPF_SOFTFAIL
-        weight = 2.5;
-        description = "SPF DNS failure";
-        groups = ["spf"];
-    }
-    "R_SPF_PERMFAIL" { # == R_SPF_FAIL
-        weight = 4.5;
-        description = "SPF record is malformed or persistent DNS error";
-        groups = ["spf"];
-    }
-
-    # DKIM
-    "R_DKIM_ALLOW" {
-        weight = -1;
-        description = "DKIM verification succeed";
-        one_shot = true;
-        groups = ["dkim"];
-    }
-    "R_DKIM_NA" {
-        weight = 0;
-        description = "Missing DKIM signature";
-        one_shot = true;
-        groups = ["dkim"];
-    }
-    "R_DKIM_TEMPFAIL" {
-        weight = 1.5;
-        description = "DKIM verification soft-failed";
-        groups = ["dkim"];
-    }
-    "R_DKIM_PERMFAIL" {
-        weight = 4.5;
-        description = "DKIM verification hard-failed (invalid)";
-        groups = ["dkim"];
-    }
-
-    "R_DKIM_REJECT" { # == R_DKIM_PERMFAIL
-        weight = 4.5;
-        description = "DKIM verification failed";
-        one_shot = true;
-        groups = ["dkim"];
-    }
-
-    # DMARC
-    "DMARC_NA" {
-        weight = 1;
-        description = "No DMARC record";
-        groups = ["dmarc"];
-    }
-    "DMARC_POLICY_QUARANTINE" {
-        weight = 1.5;
-        description = "DMARC quarantine policy";
-        groups = ["dmarc"];
-    }
-    "DMARC_POLICY_REJECT" {
-        weight = 2;
-        description = "DMARC reject policy";
-        groups = ["dmarc"];
-    }
-
-    "DMARC_POLICY_ALLOW" { # no equivalent
-        weight = -1;
-        description = "DMARC permit policy";
-        groups = ["dmarc"];
-    }
-    "DMARC_POLICY_ALLOW_WITH_FAILURES" { # no equivalent
-        weight = -0.5;
-        description = "DMARC permit policy with DKIM/SPF failure";
-        groups = ["dmarc"];
-    }
-    "DMARC_POLICY_SOFTFAIL" { # == DMARC_POLICY_QUARANTINE
-        weight = 1.5;
-        description = "DMARC soft-failed";
-        groups = ["dmarc"];
-    }
-}