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

fix del_header function

Browse Source
This commit is contained in:
Thomas Oettli
2020-06-09 16:31:46 +02:00
parent 745027b2d5
commit 5a59ab69b9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pymodmilter/actions.py
View File

@@ -295,7 +295,7 @@ def add_disclaimer(text, html, action, policy, milter, pretend=False,
if not msg.is_multipart(): if not msg.is_multipart():
update_headers = True update_headers = True
except RuntimeError as e: except RuntimeError as e:
logger.info("inject empty plain and html body parts") logger.info(f"{e}, inject empty plain and html body")
msg = _inject_body(milter, msg) msg = _inject_body(milter, msg)
_patch_message_body(msg, action, text, html, logger) _patch_message_body(msg, action, text, html, logger)
data = _serialize_msg(msg, logger) data = _serialize_msg(msg, logger)
@@ -412,8 +412,9 @@ class Action:
self._func = mod_header self._func = mod_header
self._args["value"] = args["value"] self._args["value"] = args["value"]
regex_args.append("search") regex_args.append("search")
elif action_type == "del_header" and "value" in args: elif action_type == "del_header":
self._func = del_header self._func = del_header
if "value" in args:
regex_args.append("value") regex_args.append("value")
for arg in regex_args: for arg in regex_args: