From 67062677b092fed8f0100abcaa4dd5aa2e39b72a Mon Sep 17 00:00:00 2001
From: missytake <missytake@systemli.org>
Date: Sun, 15 Oct 2023 23:11:55 +0200
Subject: [PATCH] disable some unnecessary rspamd modules

---
 cmdeploy/src/cmdeploy/__init__.py             | 20 +++++++++++++++++++
 .../src/cmdeploy}/rspamd/dkim_signing.conf.j2 |  0
 cmdeploy/src/cmdeploy/rspamd/hfilter.conf     |  5 +++++
 cmdeploy/src/cmdeploy/rspamd/phishing.conf    |  1 +
 .../src/cmdeploy}/rspamd/redis.conf           |  0
 5 files changed, 26 insertions(+)
 rename {deploy-chatmail/src/deploy_chatmail => cmdeploy/src/cmdeploy}/rspamd/dkim_signing.conf.j2 (100%)
 create mode 100644 cmdeploy/src/cmdeploy/rspamd/hfilter.conf
 create mode 100644 cmdeploy/src/cmdeploy/rspamd/phishing.conf
 rename {deploy-chatmail/src/deploy_chatmail => cmdeploy/src/cmdeploy}/rspamd/redis.conf (100%)

diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py
index f1563d4f..6cd991c7 100644
--- a/cmdeploy/src/cmdeploy/__init__.py
+++ b/cmdeploy/src/cmdeploy/__init__.py
@@ -396,6 +396,26 @@ def _configure_rspamd(dkim_selector: str, mail_domain: str) -> bool:
     """Configures rspamd for Rate Limiting."""
     need_restart = False
 
+    phishing_conf = files.put(
+        name="disable phishing rspamd plugin",
+        src=importlib.resources.files(__package__).joinpath("rspamd/phishing.conf"),
+        dest="/etc/rspamd/local.d/phishing.conf",
+        user="root",
+        group="root",
+        mode="644",
+    )
+    need_restart |= phishing_conf.changed
+
+    hfilter = files.put(
+        name="disable hfilter rspamd plugin",
+        src=importlib.resources.files(__package__).joinpath("rspamd/hfilter.conf"),
+        dest="/etc/rspamd/local.d/hfilter.conf",
+        user="root",
+        group="root",
+        mode="644",
+    )
+    need_restart |= hfilter.changed
+
     dkim_directory = "/var/lib/rspamd/dkim/"
     dkim_key_path = f"{dkim_directory}{mail_domain}.{dkim_selector}.key"
 
diff --git a/deploy-chatmail/src/deploy_chatmail/rspamd/dkim_signing.conf.j2 b/cmdeploy/src/cmdeploy/rspamd/dkim_signing.conf.j2
similarity index 100%
rename from deploy-chatmail/src/deploy_chatmail/rspamd/dkim_signing.conf.j2
rename to cmdeploy/src/cmdeploy/rspamd/dkim_signing.conf.j2
diff --git a/cmdeploy/src/cmdeploy/rspamd/hfilter.conf b/cmdeploy/src/cmdeploy/rspamd/hfilter.conf
new file mode 100644
index 00000000..87efb911
--- /dev/null
+++ b/cmdeploy/src/cmdeploy/rspamd/hfilter.conf
@@ -0,0 +1,5 @@
+helo_enabled = false;
+hostname_enabled = false;
+url_enabled = false;
+from_enabled = false;
+rcpt_enabled = false;
diff --git a/cmdeploy/src/cmdeploy/rspamd/phishing.conf b/cmdeploy/src/cmdeploy/rspamd/phishing.conf
new file mode 100644
index 00000000..69be164c
--- /dev/null
+++ b/cmdeploy/src/cmdeploy/rspamd/phishing.conf
@@ -0,0 +1 @@
+phishtank_enabled = false;
diff --git a/deploy-chatmail/src/deploy_chatmail/rspamd/redis.conf b/cmdeploy/src/cmdeploy/rspamd/redis.conf
similarity index 100%
rename from deploy-chatmail/src/deploy_chatmail/rspamd/redis.conf
rename to cmdeploy/src/cmdeploy/rspamd/redis.conf