mirror of
https://github.com/chatmail/relay.git
synced 2026-05-18 20:08:21 +00:00
filtermail: improve check_armored_payload() (#679)
This commit is contained in:
@@ -101,13 +101,12 @@ def check_armored_payload(payload: str, outgoing: bool):
|
|||||||
return False
|
return False
|
||||||
payload = payload.removesuffix(suffix)
|
payload = payload.removesuffix(suffix)
|
||||||
|
|
||||||
# Disallow comments in outgoing messages
|
|
||||||
version_comment = "Version: "
|
version_comment = "Version: "
|
||||||
if payload.startswith(version_comment):
|
if payload.startswith(version_comment):
|
||||||
version_line = payload.splitlines()[0]
|
if outgoing: # Disallow comments in outgoing messages
|
||||||
payload = payload.removeprefix(version_line)
|
|
||||||
if outgoing:
|
|
||||||
return False
|
return False
|
||||||
|
# Remove comments from incoming messages
|
||||||
|
payload = payload.split("\r\n", maxsplit=1)[1]
|
||||||
|
|
||||||
while payload.startswith("\r\n"):
|
while payload.startswith("\r\n"):
|
||||||
payload = payload.removeprefix("\r\n")
|
payload = payload.removeprefix("\r\n")
|
||||||
|
|||||||
Reference in New Issue
Block a user