From b7fadcd4be253cb0179067a937059ff1af4bfe55 Mon Sep 17 00:00:00 2001 From: adb Date: Mon, 20 Oct 2025 09:55:53 +0200 Subject: [PATCH] filtermail: improve check_armored_payload() (#679) --- chatmaild/src/chatmaild/filtermail.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chatmaild/src/chatmaild/filtermail.py b/chatmaild/src/chatmaild/filtermail.py index 711f6585..e6c072db 100644 --- a/chatmaild/src/chatmaild/filtermail.py +++ b/chatmaild/src/chatmaild/filtermail.py @@ -101,13 +101,12 @@ def check_armored_payload(payload: str, outgoing: bool): return False payload = payload.removesuffix(suffix) - # Disallow comments in outgoing messages version_comment = "Version: " if payload.startswith(version_comment): - version_line = payload.splitlines()[0] - payload = payload.removeprefix(version_line) - if outgoing: + if outgoing: # Disallow comments in outgoing messages return False + # Remove comments from incoming messages + payload = payload.split("\r\n", maxsplit=1)[1] while payload.startswith("\r\n"): payload = payload.removeprefix("\r\n")