spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix body injection and exit if no recipients left

Browse Source
This commit is contained in:
Thomas Oettli
2022-03-14 11:49:32 +01:00
parent 018e87f51f
commit 023a8412e8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pyquarantine/base.py
View File

@@ -135,12 +135,9 @@ class MilterMessage(MIMEPart):
else: else:
parent.make_mixed() parent.make_mixed()
maintype, subtype = ("multipart", "mixed") maintype, subtype = ("multipart", "mixed")
elif subtype == "related":
parent.make_alternative()
maintype, subtype = ("multipart", "alternative")
text_body = parent.get_body(preferencelist=("plain")) text_body = parent.get_body(preferencelist=("plain"))
html_body = parent.get_body(preferencelist=("related", "html")) html_body = parent.get_body(preferencelist=("html"))
if text_content is not None: if text_content is not None:
if text_body: if text_body:

5
pyquarantine/storage.py
View File

@@ -563,6 +563,7 @@ class Quarantine:
if self._milter_action is not None: if self._milter_action is not None:
milter.delrcpt(rcpts) milter.delrcpt(rcpts)
if self._milter_action in ["ACCEPT", "REJECT"] and \ #if self._milter_action in ["ACCEPT", "REJECT"] and \
not milter.msginfo["rcpts"]: # not milter.msginfo["rcpts"]:
if not milter.msginfo["rcpts"]:
return (self._milter_action, self._reason) return (self._milter_action, self._reason)