amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-05-08 04:55:25 +00:00
Code Issues Projects Releases Wiki Activity

Actually fix file content detection

Browse Source
This commit is contained in:
Sean Whalen
2018-03-14 21:02:11 -04:00
parent 1f73dcfe8c
commit 9a4a66f22b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parsedmarc.py
+14 -10
View File
@@ -947,16 +947,20 @@ def parse_report_email(input_, nameservers=None, timeout=6.0):
result = OrderedDict([("report_type", "forensic"),
("report", forensic_report)])
payload = b64decode(part.get_payload())
if payload.startswith(MAGIC_ZIP) or \
payload.startswith(MAGIC_GZIP) or \
payload.startswith(MAGIC_XML):
ns = nameservers
aggregate_report = parse_aggregate_report_file(payload,
nameservers=ns,
timeout=timeout)
result = OrderedDict([("report_type", "aggregate"),
("report", aggregate_report)])
try:
payload = b64decode(payload)
if payload.startswith(MAGIC_ZIP) or \
payload.startswith(MAGIC_GZIP) or \
payload.startswith(MAGIC_XML):
ns = nameservers
aggregate_report = parse_aggregate_report_file(payload,
nameservers=ns,
timeout=timeout)
result = OrderedDict([("report_type", "aggregate"),
("report", aggregate_report)])
except TypeError:
pass
if result is None:
error = 'Message with subject "{0}" is ' \
'not a valid DMARC report'.format(subject)