amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-05-19 02:15:35 +00:00
Code Issues Projects Releases Wiki Activity

Check for duplicate aggregate report IDs when processing a mailbox

Browse Source 
Fix #535
This commit is contained in:
Sean Whalen
2025-01-07 11:56:51 -05:00
parent 20843b920f
commit b9df12700b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parsedmarc/__init__.py
+8
View File
@@ -54,6 +54,7 @@ MAGIC_XML = b"\x3c\x3f\x78\x6d\x6c\x20"
MAGIC_JSON = b"\7b"
IP_ADDRESS_CACHE = ExpiringDict(max_len=10000, max_age_seconds=14400)
SEEN_AGGREGATE_REPORT_IDS = ExpiringDict(max_len=100000000, max_age_seconds=3600)
REVERSE_DNS_MAP = dict()
@@ -1470,6 +1471,13 @@ def get_dmarc_reports_from_mbox(
strip_attachment_payloads=sa,
)
if parsed_email["report_type"] == "aggregate":
report_id = parsed_email["report"]["report_metadata"]["report_id"]
if report_id not in SEEN_AGGREGATE_REPORT_IDS:
SEEN_AGGREGATE_REPORT_IDS[report_id] = report_id
aggregate_reports.append(parsed_email["report"])
else:
logger.debug("Skipping duplicate aggregate report "
f"with ID: {report_id}")
aggregate_reports.append(parsed_email["report"])
elif parsed_email["report_type"] == "forensic":
forensic_reports.append(parsed_email["report"])
parsedmarc/cli.py
+2 -1
View File
@@ -1426,7 +1426,8 @@ def _main():
SEEN_AGGREGATE_REPORT_IDS[report_id] = report_id
aggregate_reports.append(result[0]["report"])
else:
logger.debug(f"Skipping duplicate report ID: {report_id}")
logger.debug("Skipping duplicate aggregate report "
f"with ID: {report_id}")
elif result[0]["report_type"] == "forensic":
forensic_reports.append(result[0]["report"])
elif result[0]["report_type"] == "smtp_tls":