Fix email parsing

2026-02-17 07:03:58 +00:00 · 2018-10-14 17:58:47 -04:00
parent 48ca180db5
commit 2c8c7f4659
2 changed files with 55 additions and 60 deletions
--- a/parsedmarc/init.py
+++ b/parsedmarc/init.py
@@ -683,57 +683,52 @@ def parse_report_email(input_, nameservers=None, timeout=2.0):
                    sample = payload
                elif content_type == "message/rfc822":
                    sample = payload[0].__str__()
-                elif content_type == "multipart/report":
-                    if "Feedback-Type" in payload_:
-                        feedback_report = payload_
-                    elif "message/rfc822" in payload_:
-                        sample = payload_
-                    elif "text/rfc822-headers" in payload_:
-                        sample = payload_
-        if feedback_report and sample:
-            try:
-                forensic_report = parse_forensic_report(
-                    feedback_report,
-                    sample,
-                    date,
-                    nameservers=nameservers,
-                    timeout=timeout)
-            except Exception as e:
-                raise ParserError(e.__str__())

-            result = OrderedDict([("report_type", "forensic"),
-                                  ("report", forensic_report)])
-            return result
+    if feedback_report and sample:
        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, ValueError, binascii.Error):
-            pass
+            forensic_report = parse_forensic_report(
+                feedback_report,
+                sample,
+                date,
+                nameservers=nameservers,
+                timeout=timeout)
+        except Exception as e:
+            raise ParserError(e.__str__())

-        except InvalidAggregateReport as e:
-            error = 'Message with subject "{0}" ' \
-                    'is not a valid ' \
-                    'aggregate DMARC report: {1}'.format(subject, e)
-            raise InvalidAggregateReport(error)
+        result = OrderedDict([("report_type", "forensic"),
+                              ("report", forensic_report)])
+        return result

-        except InvalidForensicReport as e:
-            error = 'Message with subject "{0}" ' \
-                    'is not a valid ' \
-                    'forensic DMARC report: {1}'.format(subject, e)
-            raise InvalidForensicReport(error)
+    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, ValueError, binascii.Error):
+        pass

-        except FileNotFoundError as e:
-            error = 'Unable to parse message with subject "{0}": {1}' .format(
-                subject, e)
-            raise InvalidDMARCReport(error)
+    except InvalidAggregateReport as e:
+        error = 'Message with subject "{0}" ' \
+                'is not a valid ' \
+                'aggregate DMARC report: {1}'.format(subject, e)
+        raise InvalidAggregateReport(error)
+
+    except InvalidForensicReport as e:
+        error = 'Message with subject "{0}" ' \
+                'is not a valid ' \
+                'forensic DMARC report: {1}'.format(subject, e)
+        raise InvalidForensicReport(error)
+
+    except FileNotFoundError as e:
+        error = 'Unable to parse message with subject "{0}": {1}' .format(
+            subject, e)
+        raise InvalidDMARCReport(error)

    if result is None:
        error = 'Message with subject "{0}" is ' \
--- a/(mail-from=sharepoint@domain.de,
+++ b/(mail-from=sharepoint@domain.de,
@@ -5,15 +5,15 @@ Received: from  mailrelay.de ([234.234.234.234])
          Mon, 1 Oct 2018 11:20:27 +0200
 Return-Path: <dmarc-report@domain.de>
 Received: from [127.0.0.1] ([local])
-    by  mailrelay.de (envelope-from <dmarc-report@domain.de>)
-    (ecelerity 4.2.39.63080 r(Core:4.2.39.2)) with UNKNOWN
-    id 48/E7-30937-BD6E1BB5; Mon, 01 Oct 2018 11:20:27 +0200
+	by  mailrelay.de (envelope-from <dmarc-report@domain.de>)
+	(ecelerity 4.2.39.63080 r(Core:4.2.39.2)) with UNKNOWN
+	id 48/E7-30937-BD6E1BB5; Mon, 01 Oct 2018 11:20:27 +0200
 Subject: DMARC Failure Report for domain.de (mail-from=sharepoint@domain.de, ip=10.10.10.10)
 To: dmarc-report@domain.de
 From: dmarc-report@domain.de
 X-MIMETrack: Itemize by SMTP Server on Servername/DOMAIN(Release 9.0.1FP10 HF197|April
 16, 2018) at 01.10.2018 11:20:27,
-    Serialize by Notes Client on Peter Pan/DOMAIN(Release 9.0.1|October
+	Serialize by Notes Client on Peter Pan/DOMAIN(Release 9.0.1|October
 14, 2013) at 05.10.2018 23:38:45
 X-Notes-Item: Memo;
 name=Form
@@ -22,7 +22,7 @@ X-Notes-Item: CN=Servername/O=DOMAIN;
 type=501; flags=44; name=$UpdatedBy
 Message-ID: <OF587285BA.CB01D107-ONC1258319.00334FCF@LocalDomain>
 X-Notes-Item: CN=Servername/O=DOMAIN,
-    CN=DE9899SL4/O=DOMAIN;
+	CN=DE9899SL4/O=DOMAIN;
 type=501; flags=0; name=RouteServers
 X-Notes-Item: =?UTF-8?B?MDEtT2N0LTIwMTggMTE6MjA6MjcgQ0VEVC8wMS1PY3QtMjAxOCAxMToyMDo=?=
 =?UTF-8?B?MjcgQ0VEVCwgMDEtT2N0LTIwMTggMTE6MjA6MjcgQ0VEVC8wMS1PY3Qt?=
@@ -46,18 +46,18 @@ X-Notes-Item: 1;
 name=$NoteHasNativeMIME
 Content-Type: multipart/report; report-type=feedback-report;
    boundary="_----jqB1YyrX3TKBNru++5PX3w===_48/E7-30937-BD6E1BB5"
- 
+
 --_----jqB1YyrX3TKBNru++5PX3w===_48/E7-30937-BD6E1BB5
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset="US-ASCII"
- 
+
 This is an email abuse report for an email message received from IP 10.10.10.10 on Mon, 01 Oct 2018 11:20:27 +0200.
 The message below did not meet the sending domain's DMARC policy.
 For more information about this format please see http://tools.ietf.org/html/rfc6591 .
- 
+
 --_----jqB1YyrX3TKBNru++5PX3w===_48/E7-30937-BD6E1BB5
 Content-Type: message/feedback-report; name=report
- 
+
 Feedback-Type: auth-failure
 User-Agent: Lua/1.0
 Version: 1.0
@@ -70,13 +70,13 @@ Source-IP: 10.10.10.10
 Delivery-Result: smg-policy-action
 Auth-Failure: dmarc
 Reported-Domain: domain.de
- 
+
 --_----jqB1YyrX3TKBNru++5PX3w===_48/E7-30937-BD6E1BB5
 Content-Type: message/rfc822
 Content-Disposition: inline
- 
+
 Received: from Servernameone.domain.local (Servernameone.domain.local [10.10.10.10])
-    by  mailrelay.de (mail.DOMAIN.de) with SMTP id 38.E7.30937.BD6E1BB5; Mon,  1 Oct 2018 11:20:27 +0200 (CEST)
+	by  mailrelay.de (mail.DOMAIN.de) with SMTP id 38.E7.30937.BD6E1BB5; Mon,  1 Oct 2018 11:20:27 +0200 (CEST)
 Date: 01 Oct 2018 11:20:27 +0200
 Message-ID: <38.E7.30937.BD6E1BB5@ mailrelay.de>
 To: <peter.pan@domain.de>
@@ -86,10 +86,10 @@ MIME-Version: 1.0
 X-Mailer: Microsoft SharePoint Foundation 2010
 Content-Type: text/html; charset=utf-8
 Content-Transfer-Encoding: quoted-printable
- 
+
 <html><head><base href=3D'
 wettbewerb' /></head><body><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"=
 ><HTML><HEAD><META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version=
 08.01.0240.003"></html>
- 
+
 --_----jqB1YyrX3TKBNru++5PX3w===_48/E7-30937-BD6E1BB5--