From 0125dda6d7a354bc4cda462efa28e5b9a91d910c Mon Sep 17 00:00:00 2001 From: missytake Date: Fri, 18 Apr 2025 14:36:46 +0200 Subject: [PATCH] echo: add echo@ to passthrough_senders in default config --- chatmaild/src/chatmaild/config.py | 1 + chatmaild/src/chatmaild/filtermail.py | 3 +-- chatmaild/src/chatmaild/ini/chatmail.ini.f | 2 +- chatmaild/src/chatmaild/ini/override-testrun.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index 971906bd..72befc7c 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -116,6 +116,7 @@ def get_default_config_content(mail_domain, **overrides): lines = [] for line in content.split("\n"): for key, value in privacy.items(): + value = value.format(mail_domain=mail_domain) value_lines = value.strip().split("\n") if not line.startswith(f"{key} =") or not value_lines: continue diff --git a/chatmaild/src/chatmaild/filtermail.py b/chatmaild/src/chatmaild/filtermail.py index 6384c2e9..c0e0fcd3 100644 --- a/chatmaild/src/chatmaild/filtermail.py +++ b/chatmaild/src/chatmaild/filtermail.py @@ -262,8 +262,7 @@ class OutgoingBeforeQueueHandler: return passthrough_recipients = self.config.passthrough_recipients - passthrough_recipients.append("echo@" + self.config.mail_domain) - + for recipient in envelope.rcpt_tos: if recipient_matches_passthrough(recipient, passthrough_recipients): continue diff --git a/chatmaild/src/chatmaild/ini/chatmail.ini.f b/chatmaild/src/chatmaild/ini/chatmail.ini.f index 38743d56..a99fb508 100644 --- a/chatmaild/src/chatmaild/ini/chatmail.ini.f +++ b/chatmaild/src/chatmaild/ini/chatmail.ini.f @@ -43,7 +43,7 @@ passthrough_senders = # list of e-mail recipients for which to accept outbound un-encrypted mails # (space-separated, item may start with "@" to whitelist whole recipient domains) -passthrough_recipients = xstore@testrun.org +passthrough_recipients = xstore@testrun.org echo@{mail_domain} # # Deployment Details diff --git a/chatmaild/src/chatmaild/ini/override-testrun.ini b/chatmaild/src/chatmaild/ini/override-testrun.ini index b3c32f17..f8bcb533 100644 --- a/chatmaild/src/chatmaild/ini/override-testrun.ini +++ b/chatmaild/src/chatmaild/ini/override-testrun.ini @@ -1,7 +1,7 @@ [privacy] -passthrough_recipients = privacy@testrun.org xstore@testrun.org +passthrough_recipients = privacy@testrun.org xstore@testrun.org echo@{mail_domain} privacy_postal = Merlinux GmbH, Represented by the managing director H. Krekel,