From fb54e3b742c262bcd3fea6ba59312d8e4dc0723e Mon Sep 17 00:00:00 2001
From: Sean Whalen <seanthegeek@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:22:02 -0500
Subject: [PATCH] 9.0.5

- Fix report type detection bug introduced in `9.0.4` (yanked).
---
 CHANGELOG.md            |  8 +++++++-
 parsedmarc/__init__.py  | 17 ++++++++++++++---
 parsedmarc/constants.py |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4da3d0..138b968 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## 9.0.4
+## 9.0.5
+
+## Fixes
+
+- Fix report type detection introduced in `9.0.4`.
+
+## 9.0.4 (Yanked)
 
 ### Fixes
 
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index d30da73..955de32 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -57,6 +57,17 @@ MAGIC_GZIP = b"\x1f\x8b"
 MAGIC_XML = b"\x3c\x3f\x78\x6d\x6c\x20"
 MAGIC_JSON = b"\7b"
 
+EMAIL_SAMPLE_CONTENT_TYPES = (
+    "text/rfc822",
+    "text-rfc-822",
+    "text/rfc822-headers",
+    "text/rfc-822-headers",
+    "message/rfc822",
+    "message/rfc-822",
+    "message/rfc822-headers"
+    "message-rfc-822-headers"
+)
+
 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()
@@ -1428,6 +1439,7 @@ def parse_report_email(
     feedback_report = None
     smtp_tls_report = None
     sample = None
+    is_feedback_report: bool = False
     if "From" in msg_headers:
         logger.info("Parsing mail from {0} on {1}".format(msg_headers["From"], date))
     if "Subject" in msg_headers:
@@ -1443,6 +1455,7 @@ def parse_report_email(
         if content_type == "text/html":
             continue
         elif content_type == "message/feedback-report":
+            is_feedback_report = True
             try:
                 if "Feedback-Type" in payload:
                     feedback_report = payload
@@ -1453,9 +1466,7 @@ def parse_report_email(
                 feedback_report = feedback_report.replace("\\n", "\n")
             except (ValueError, TypeError, binascii.Error):
                 feedback_report = payload
-        elif content_type == "text/rfc822-headers" or "message/rfc-822":
-            sample = payload
-        elif content_type == "message/rfc822":
+        elif is_feedback_report and content_type in EMAIL_SAMPLE_CONTENT_TYPES:
             sample = payload
         elif content_type == "application/tlsrpt+json":
             if not payload.strip().startswith("{"):
diff --git a/parsedmarc/constants.py b/parsedmarc/constants.py
index 180fd1a..6cf23f3 100644
--- a/parsedmarc/constants.py
+++ b/parsedmarc/constants.py
@@ -1,3 +1,3 @@
-__version__ = "9.0.4"
+__version__ = "9.0.5"
 
 USER_AGENT = f"parsedmarc/{__version__}"