This commit is contained in:
2021-10-04 20:17:20 +02:00
parent c4755a3316
commit 082789e1d4
2 changed files with 12 additions and 2 deletions

View File

@@ -109,12 +109,17 @@ def list_quarantines(quarantines, args):
else:
whitelist_type = "NONE"
if "milter_action" in cfg:
milter_action = cfg["milter_action"]
else:
milter_action = "NONE"
qlist.append({
"name": q["name"],
"storage": storage_type,
"notification": notification_type,
"whitelist": whitelist_type,
"action": q["args"]["milter_action"]})
"action": milter_action})
print_table(
[("Name", "name"),

View File

@@ -206,7 +206,12 @@ class FileMailStorage(BaseMailStorage):
data = milter.fp.read
mailfrom = milter.mailfrom
recipients = list(milter.rcpts)
subject = ""
# getting the subject is the only operation that needs any
# parsing of the message, catch all exceptions here
try:
subject = milter.msg["subject"] or ""
except Exception as e:
subject = ""
else:
data = milter.msg.as_bytes
mailfrom = milter.msginfo["mailfrom"]