diff --git a/_modules/index.html b/_modules/index.html
index 12f6e6e..ea7d6fb 100644
--- a/_modules/index.html
+++ b/_modules/index.html
@@ -5,14 +5,14 @@
- Overview: module code — parsedmarc 9.0.4 documentation
+ Overview: module code — parsedmarc 9.0.5 documentation
-
+
diff --git a/_modules/parsedmarc.html b/_modules/parsedmarc.html
index d9774e9..579ff19 100644
--- a/_modules/parsedmarc.html
+++ b/_modules/parsedmarc.html
@@ -5,14 +5,14 @@
- parsedmarc — parsedmarc 9.0.4 documentation
+ parsedmarc — parsedmarc 9.0.5 documentation
-
+
@@ -138,6 +138,17 @@
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()
@@ -1562,6 +1573,7 @@
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:
@@ -1577,6 +1589,7 @@
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
@@ -1587,9 +1600,7 @@
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/_modules/parsedmarc/elastic.html b/_modules/parsedmarc/elastic.html
index a3ae614..d210d54 100644
--- a/_modules/parsedmarc/elastic.html
+++ b/_modules/parsedmarc/elastic.html
@@ -5,14 +5,14 @@
- parsedmarc.elastic — parsedmarc 9.0.4 documentation
+ parsedmarc.elastic — parsedmarc 9.0.5 documentation
-
+
diff --git a/_modules/parsedmarc/opensearch.html b/_modules/parsedmarc/opensearch.html
index 458082b..199de42 100644
--- a/_modules/parsedmarc/opensearch.html
+++ b/_modules/parsedmarc/opensearch.html
@@ -5,14 +5,14 @@
- parsedmarc.opensearch — parsedmarc 9.0.4 documentation
+ parsedmarc.opensearch — parsedmarc 9.0.5 documentation
-
+
diff --git a/_modules/parsedmarc/splunk.html b/_modules/parsedmarc/splunk.html
index 98062f0..f57dde2 100644
--- a/_modules/parsedmarc/splunk.html
+++ b/_modules/parsedmarc/splunk.html
@@ -5,14 +5,14 @@
- parsedmarc.splunk — parsedmarc 9.0.4 documentation
+ parsedmarc.splunk — parsedmarc 9.0.5 documentation
-
+
diff --git a/_modules/parsedmarc/utils.html b/_modules/parsedmarc/utils.html
index 87fea3d..2ead7d7 100644
--- a/_modules/parsedmarc/utils.html
+++ b/_modules/parsedmarc/utils.html
@@ -5,14 +5,14 @@
- parsedmarc.utils — parsedmarc 9.0.4 documentation
+ parsedmarc.utils — parsedmarc 9.0.5 documentation
-
+
diff --git a/_static/documentation_options.js b/_static/documentation_options.js
index a0cf86f..68ae849 100644
--- a/_static/documentation_options.js
+++ b/_static/documentation_options.js
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
- VERSION: '9.0.4',
+ VERSION: '9.0.5',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/api.html b/api.html
index 543c2e7..9eafeba 100644
--- a/api.html
+++ b/api.html
@@ -6,14 +6,14 @@
- API reference — parsedmarc 9.0.4 documentation
+ API reference — parsedmarc 9.0.5 documentation
-
+
diff --git a/contributing.html b/contributing.html
index f3f331d..d437d90 100644
--- a/contributing.html
+++ b/contributing.html
@@ -6,14 +6,14 @@
- Contributing to parsedmarc — parsedmarc 9.0.4 documentation
+ Contributing to parsedmarc — parsedmarc 9.0.5 documentation
-
+
diff --git a/davmail.html b/davmail.html
index e633659..7ea9553 100644
--- a/davmail.html
+++ b/davmail.html
@@ -6,14 +6,14 @@
- Accessing an inbox using OWA/EWS — parsedmarc 9.0.4 documentation
+ Accessing an inbox using OWA/EWS — parsedmarc 9.0.5 documentation
-
+
diff --git a/dmarc.html b/dmarc.html
index 7bd5f28..710333e 100644
--- a/dmarc.html
+++ b/dmarc.html
@@ -6,14 +6,14 @@
- Understanding DMARC — parsedmarc 9.0.4 documentation
+ Understanding DMARC — parsedmarc 9.0.5 documentation
-
+
diff --git a/elasticsearch.html b/elasticsearch.html
index ce79d04..9c2ac22 100644
--- a/elasticsearch.html
+++ b/elasticsearch.html
@@ -6,14 +6,14 @@
- Elasticsearch and Kibana — parsedmarc 9.0.4 documentation
+ Elasticsearch and Kibana — parsedmarc 9.0.5 documentation
-
+
diff --git a/genindex.html b/genindex.html
index a82d1b6..e4fb4d9 100644
--- a/genindex.html
+++ b/genindex.html
@@ -5,14 +5,14 @@
- Index — parsedmarc 9.0.4 documentation
+ Index — parsedmarc 9.0.5 documentation
-
+
diff --git a/index.html b/index.html
index 54fa623..76e0530 100644
--- a/index.html
+++ b/index.html
@@ -6,14 +6,14 @@
- parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 9.0.4 documentation
+ parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 9.0.5 documentation
-
+
diff --git a/installation.html b/installation.html
index 02482eb..c8af775 100644
--- a/installation.html
+++ b/installation.html
@@ -6,14 +6,14 @@
- Installation — parsedmarc 9.0.4 documentation
+ Installation — parsedmarc 9.0.5 documentation
-
+
diff --git a/kibana.html b/kibana.html
index cf74b01..86287d2 100644
--- a/kibana.html
+++ b/kibana.html
@@ -6,14 +6,14 @@
- Using the Kibana dashboards — parsedmarc 9.0.4 documentation
+ Using the Kibana dashboards — parsedmarc 9.0.5 documentation
-
+
diff --git a/mailing-lists.html b/mailing-lists.html
index f0f079a..2859403 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -6,14 +6,14 @@
- What about mailing lists? — parsedmarc 9.0.4 documentation
+ What about mailing lists? — parsedmarc 9.0.5 documentation
-
+
diff --git a/objects.inv b/objects.inv
index 41bc017..56c7773 100644
Binary files a/objects.inv and b/objects.inv differ
diff --git a/opensearch.html b/opensearch.html
index d32ccdb..91f7e7c 100644
--- a/opensearch.html
+++ b/opensearch.html
@@ -6,14 +6,14 @@
- OpenSearch and Grafana — parsedmarc 9.0.4 documentation
+ OpenSearch and Grafana — parsedmarc 9.0.5 documentation
-
+
diff --git a/output.html b/output.html
index 2baa39f..1817782 100644
--- a/output.html
+++ b/output.html
@@ -6,14 +6,14 @@
- Sample outputs — parsedmarc 9.0.4 documentation
+ Sample outputs — parsedmarc 9.0.5 documentation
-
+
diff --git a/py-modindex.html b/py-modindex.html
index 820556b..5d666c0 100644
--- a/py-modindex.html
+++ b/py-modindex.html
@@ -5,14 +5,14 @@
- Python Module Index — parsedmarc 9.0.4 documentation
+ Python Module Index — parsedmarc 9.0.5 documentation
-
+
diff --git a/search.html b/search.html
index 3614385..f84dc20 100644
--- a/search.html
+++ b/search.html
@@ -5,7 +5,7 @@
- Search — parsedmarc 9.0.4 documentation
+ Search — parsedmarc 9.0.5 documentation
@@ -13,7 +13,7 @@
-
+
diff --git a/splunk.html b/splunk.html
index eda5ee3..096ee86 100644
--- a/splunk.html
+++ b/splunk.html
@@ -6,14 +6,14 @@
- Splunk — parsedmarc 9.0.4 documentation
+ Splunk — parsedmarc 9.0.5 documentation
-
+
diff --git a/usage.html b/usage.html
index 969077a..bd66cde 100644
--- a/usage.html
+++ b/usage.html
@@ -6,14 +6,14 @@
- Using parsedmarc — parsedmarc 9.0.4 documentation
+ Using parsedmarc — parsedmarc 9.0.5 documentation
-
+