amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-04-23 13:59:31 +00:00
Code Issues Projects Releases Wiki Activity

Ignore errors when parsing text-based forensic reports (#460)

Browse Source 
Starting 8.2.0, parsedmarc crashes instead of ignoring some invalid reports.

The original change was introduced in abf9695228.
This commit is contained in:
bendem
2024-02-20 00:51:28 +01:00
committed by GitHub
parent b8088505b1
commit fc49f7f56c
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parsedmarc/__init__.py
View File

@@ -1056,16 +1056,23 @@ def parse_report_email(input_, offline=False, ip_db_path=None,
elif content_type == "text/plain":
if "A message claiming to be from you has failed" in payload:
parts = payload.split("detected.")
field_matches = text_report_regex.findall(parts[0])
fields = dict()
for match in field_matches:
field_name = match[0].lower().replace(" ", "-")
fields[field_name] = match[1].strip()
feedback_report = "Arrival-Date: {}\n" \
"Source-IP: {}" \
"".format(fields["received-date"],
fields["sender-ip-address"])
try:
parts = payload.split("detected.", 1)
field_matches = text_report_regex.findall(parts[0])
fields = dict()
for match in field_matches:
field_name = match[0].lower().replace(" ", "-")
fields[field_name] = match[1].strip()
feedback_report = "Arrival-Date: {}\n" \
"Source-IP: {}" \
"".format(fields["received-date"],
fields["sender-ip-address"])
except Exception as e:
error = 'Unable to parse message with ' \
'subject "{0}": {1}'.format(subject, e)
raise InvalidDMARCReport(error)
sample = parts[1].lstrip()
logger.debug(sample)
else: