From 59bc4f7aea9da3f3ccf9ceca9a07af825de9e4af Mon Sep 17 00:00:00 2001
From: anrc <15327800+githtz@users.noreply.github.com>
Date: Thu, 24 Sep 2020 13:16:25 +0200
Subject: [PATCH 1/2] Remove the username from the milter_headers

Rspamd adds the name of the authenticated user by default. Setting add_smtp_user to false prevents the login to be leaked.
---
 core/rspamd/conf/milter_headers.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/rspamd/conf/milter_headers.conf b/core/rspamd/conf/milter_headers.conf
index cb680cfa..7da200df 100644
--- a/core/rspamd/conf/milter_headers.conf
+++ b/core/rspamd/conf/milter_headers.conf
@@ -5,6 +5,9 @@ skip_authenticated = false;
 use = ["x-spamd-bar", "x-spam-level", "x-virus", "authentication-results"];
 
 routines {
+  authentication-results {
+    add_smtp_user = false;
+  }
   x-virus {
     symbols = ["CLAM_VIRUS", "FPROT_VIRUS", "JUST_EICAR"];
   }

From 3f037e2f08acdf078064e4e03fc1c2b46551b27a Mon Sep 17 00:00:00 2001
From: anrc <15327800+githtz@users.noreply.github.com>
Date: Thu, 24 Sep 2020 16:53:42 +0200
Subject: [PATCH 2/2] Add changelog

---
 towncrier/newsfragments/1638.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/1638.fix

diff --git a/towncrier/newsfragments/1638.fix b/towncrier/newsfragments/1638.fix
new file mode 100644
index 00000000..9a87e41e
--- /dev/null
+++ b/towncrier/newsfragments/1638.fix
@@ -0,0 +1 @@
+Hide the login of the user in sent emails