From 410663dbcaba019ca3d3744946348b56a635480b Mon Sep 17 00:00:00 2001
From: pphillips99 <pphillips99@gmail.com>
Date: Tue, 16 Jul 2024 13:53:27 -0500
Subject: [PATCH] fixup and tests to extract_report() to handle documented
 inputs (#530)

---
 parsedmarc/__init__.py                    |  21 +-
 samples/extract_report/changed-input.xml  | 592 ++++++++++++++++++++++
 samples/extract_report/nice-input.xml     | 592 ++++++++++++++++++++++
 samples/extract_report/nice-input.xml.gz  | Bin 0 -> 931 bytes
 samples/extract_report/nice-input.xml.zip | Bin 0 -> 1076 bytes
 tests.py                                  |  77 ++-
 6 files changed, 1272 insertions(+), 10 deletions(-)
 create mode 100644 samples/extract_report/changed-input.xml
 create mode 100644 samples/extract_report/nice-input.xml
 create mode 100644 samples/extract_report/nice-input.xml.gz
 create mode 100644 samples/extract_report/nice-input.xml.zip

diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 8d94b428..9d46e2c4 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -591,14 +591,19 @@ def extract_report(input_):
         str: The extracted text
 
     """
+    def is_base64(s):
+        base64_regex = re.compile(r'^[A-Za-z0-9+/=]+\Z')
+        return bool(base64_regex.match(s))
+
     try:
-        file_object = BytesIO()
-        if type(input_) is str:
-            try:
-                file_object = BytesIO(b64decode(input_))
-            except binascii.Error:
-                pass
-            if file_object is None:
+        file_object = None
+        if isinstance(input_, str):
+            if is_base64(input_):
+                try:
+                    file_object = BytesIO(b64decode(input_))
+                except binascii.Error:
+                    pass
+            else:
                 file_object = open(input_, "rb")
         elif type(input_) is bytes:
             file_object = BytesIO(input_)
@@ -613,7 +618,7 @@ def extract_report(input_):
                 errors='ignore')
         elif header.startswith(MAGIC_GZIP):
             report = zlib.decompress(
-                file_object.getvalue(),
+                file_object.read(),
                 zlib.MAX_WBITS | 16).decode(errors='ignore')
         elif header.startswith(MAGIC_XML) or header.startswith(MAGIC_JSON):
             report = file_object.read().decode(errors='ignore')
diff --git a/samples/extract_report/changed-input.xml b/samples/extract_report/changed-input.xml
new file mode 100644
index 00000000..31eacf5a
--- /dev/null
+++ b/samples/extract_report/changed-input.xml
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<feedback>
+  <report_metadata>
+    <org_name>fred.com</org_name>
+    <email>noreply-dmarc-support@google.com</email>
+    <extra_contact_info>https://support.google.com/a/answer/2466580</extra_contact_info>
+    <report_id>11038226378739404135</report_id>
+    <date_range>
+      <begin>1718236800</begin>
+      <end>1718323199</end>
+    </date_range>
+  </report_metadata>
+  <policy_published>
+    <domain>example.com</domain>
+    <adkim>r</adkim>
+    <aspf>r</aspf>
+    <p>none</p>
+    <sp>none</sp>
+    <pct>100</pct>
+    <np>none</np>
+  </policy_published>
+  <record>
+    <row>
+      <source_ip>209.85.220.69</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>fail</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>2</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>gmail.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.90</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.31</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.33</source_ip>
+      <count>33</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.92</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.110</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>12</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>connectivityu.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>2607:f8b0:4864:20::132</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.83</source_ip>
+      <count>36</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.96</source_ip>
+      <count>27</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.95</source_ip>
+      <count>25</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.69</source_ip>
+      <count>2252</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.94</source_ip>
+      <count>46</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.88</source_ip>
+      <count>37</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.55</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.93</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>23</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>rphvac.com</domain>
+        <result>none</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>359</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+</feedback>
diff --git a/samples/extract_report/nice-input.xml b/samples/extract_report/nice-input.xml
new file mode 100644
index 00000000..ce28c8e8
--- /dev/null
+++ b/samples/extract_report/nice-input.xml
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<feedback>
+  <report_metadata>
+    <org_name>google.com</org_name>
+    <email>noreply-dmarc-support@google.com</email>
+    <extra_contact_info>https://support.google.com/a/answer/2466580</extra_contact_info>
+    <report_id>11038226378739404135</report_id>
+    <date_range>
+      <begin>1718236800</begin>
+      <end>1718323199</end>
+    </date_range>
+  </report_metadata>
+  <policy_published>
+    <domain>example.com</domain>
+    <adkim>r</adkim>
+    <aspf>r</aspf>
+    <p>none</p>
+    <sp>none</sp>
+    <pct>100</pct>
+    <np>none</np>
+  </policy_published>
+  <record>
+    <row>
+      <source_ip>209.85.220.69</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>fail</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>2</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>gmail.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.90</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.31</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.33</source_ip>
+      <count>33</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.92</source_ip>
+      <count>40</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.110</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>12</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>connectivityu.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>2607:f8b0:4864:20::132</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.83</source_ip>
+      <count>36</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.96</source_ip>
+      <count>27</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.95</source_ip>
+      <count>25</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.69</source_ip>
+      <count>2252</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.94</source_ip>
+      <count>46</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.8.88</source_ip>
+      <count>37</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.55</source_ip>
+      <count>1</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>54.240.48.93</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>23</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>24</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>fail</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>awbr2rp4egb35wbg4umq4e5dcoe5kc4n</selector>
+      </dkim>
+      <dkim>
+        <domain>amazonses.com</domain>
+        <result>pass</result>
+        <selector>ug7nbtf4gccmlpwj322ax3p6ow6yfsug</selector>
+      </dkim>
+      <spf>
+        <domain>rphvac.com</domain>
+        <result>none</result>
+      </spf>
+    </auth_results>
+  </record>
+  <record>
+    <row>
+      <source_ip>209.85.220.41</source_ip>
+      <count>359</count>
+      <policy_evaluated>
+        <disposition>none</disposition>
+        <dkim>pass</dkim>
+        <spf>pass</spf>
+      </policy_evaluated>
+    </row>
+    <identifiers>
+      <header_from>example.com</header_from>
+    </identifiers>
+    <auth_results>
+      <dkim>
+        <domain>example.com</domain>
+        <result>pass</result>
+        <selector>google</selector>
+      </dkim>
+      <spf>
+        <domain>example.com</domain>
+        <result>pass</result>
+      </spf>
+    </auth_results>
+  </record>
+</feedback>
diff --git a/samples/extract_report/nice-input.xml.gz b/samples/extract_report/nice-input.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ed74d0e8748dbe72cf7b7ff9458f03b52038e765
GIT binary patch
literal 931
zcmV;U16=$ciwFo@`fX+a18!+!Wi4rLaCLMpcx`L|?VDS7;vf)!-}@^(eQz%0V)Ufx
zKJ72qea=BbBHIL5NYw7HUuZ76t!C}^*t*J-aTs8j;e!EV{IIFY$qEZe7`?xBE$4QE
zDPkF+#r^H~Z(r}C+sQ+66XzIb3y2<*o5>^=m@`qQ6|P|hYp7*P%0!V;SmC5#tSGUC
zSQXoYu+_m8BxORGYN33(%PJ_)oou*n?#phqR<EnGsRc|CqcuczN@&iKWnFVQx9zT~
zwXJGH8&bK(!UldA29cxMdR@P5xElt^64!OS2!PO=MpJL*JHG1$vAr#C_0?E$Dj+So
z(J0XZ7lbD6)Qx}_Mvm&OmGtG9X3wP_@Z8x<*+Toq>_1x@dfRns%vnj$Q_7n~N#qg_
zhA`zGn&1trc<-@J)+)g4kyMF@?e?J)N}fN<^k*yLDijpQHt)X6ULbo3M|I-rap{Lv
zM0+L5Tg&%Zsho?L=nWQZJ-9@&Mj)ILo&aZNMS%r?V};5$+k##dv4*PdW4nFm#a(}R
z1<OV`G3yJoXNcrXl3LB?&d6QKj-GZ)uI89h7(CRuAWt}yQu`nuy0rKAsiM}8EG8MI
zHOYx$X{ffuFvB9v1*`sy)^0)9(yRJ0Z0cnyux!eD+vJW_N6dt7p6e#MQFUL2fo&&)
z{jxu;+z0WE@$}up@dT%eXFI?>@oWQqp7DHP?t25OM~q91Y9<o6UI-w#kBfyDtQUpf
zR6l(jWQgJ55&2ZPq*opMvTM!(+h7HMF)FcqpLI<!rHeZE3xukYuYY&|z>UX4who_i
z*%W`ZZZ8Ri-Z(y)gTS|duNa7|nR6He-!U8*4o=0vJB&L83z6lG><9)0gTghT;2lOm
zml+fc3Ri)G&X9oF77Po91<iu%jvN<&Z(uMmTsjO#ULm>W4#~i9G8hn}R8=A?Qa?4H
z4MgZn=Xtbn=6)3VbKuP9t~Zi1o$RvwAQ<O-S$;w=+Mk^MZGxT0b^UN2jmFNSp;>9o
zN_**P$AH2t9Ld0^1_gt{m7t)nW`YqG0>gq~;nG<+@&y$Df{#CsnzZ}>PP_F2>yO-h
zo4ngBuou6;ZjYeR$Pv`!-3En=M`0(|2u2cbbH8U2jkhNnBNu$;cSW<hUe)S4`fB>e
zzkPM3%j-45a30&ju_%~*!Ju$56a-(cAR4!<ok*Wgf)~upu3(bx*xvpJ_BVR@i9$C!
F003|U%YXm?

literal 0
HcmV?d00001

diff --git a/samples/extract_report/nice-input.xml.zip b/samples/extract_report/nice-input.xml.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ec507d4f96098fc1393472992d9e5c684ac1ec37
GIT binary patch
literal 1076
zcmWIWW@Zs#U|`^2;Hx<wQT4Oasfn3^!Q7gGfsa9kAulsIRW~!QptMA<A~z>Agp+|e
z=2vdo=a0E*r4`%^j4ZE!iowL&+0o^X6a*UX|JJst&DVR9^kvCQySMr`YR@@3Dcxp?
z@VN4BeSC)AuC-}zzunk%YI31O!i<N_jLCmCtUPs+i`!FT@BUKV=VeWrNs<eX{(bvB
zKmPrq+b5ligr7^Kb9cy1o_$h9Y=&{*a?y2(Y}qSPy-vAI42pQTBw>xl#?}bY+szxU
z9u!qcb()#Aux8h3EsYCvb9UstJDs;RZ2juZD_MO67n{12dS#rOlp0%Xx&7_BRa@6)
zIZFraJa&k!PJ(UX;#*a*`*U|lvz-*WUb=^);lgaU;QVLS`(Cqd+^d`a^=d?+mV)lC
ziy9Z1#9P$fUFmHQck6q#cIua>Gt$m4mHTk#rq4~M-^bqAM@v`TF3ma<>3Jde)NEJJ
zCqn#f22bT?J>Xqa@qVM<HLU}0CWdr&y#2ON*lV8s=`ZQpkF-QYj+?#TcREg?n$x}X
z(W}Cj?O`s}s;8n)e~(-_r+dZ=Ua=h89WI;P6y^xcV@OYPZDegoZarmwyD3g|W812C
z$-8S`9F487U_I?-Y51CZOM1r>pGi??pPf4qd$Mm{nfJP9GlC>+uIyCsx0n+2TS0!;
zmhazJF1psQqb9k`^kipJ=8A1c3=S)uWnKNR=USfQ^-HUN8Roo7)!LAAs_OQWzEJlw
zEqU`^tL+Lbjc;qrRd4>g$$sq}_K&?EzuZ0ik!5*Ty7d9uk2%b>^FG!jzN=<l<=*4n
zlcgrKBaTC1M}K##_!{xn`yuwVGASJo9|-;o*|{WK_Rps5bBwnWSnCb7HrC89^)+1D
zZS|eIW!0qh^%V>UdXGDA<C|Y}Q>1=to<3*mJqx>;%?GwOte5CmGqYHN`M#ly1fSp0
zgVsIPtlSfy_P*g@V{JZUy6}Olo8xpz5gxAa#-?)<8g7d5aJR9ZZF=1&Bi@joU|<kq
z#p52Qxbqp`$pZyO5(0}uLY1_G>`mwMy1ejtUb&^<S)ItQ;s<A*uQQ)yJon9}KME4h
zYa;8M3~tSz^Dnn)?(x#U1#-Q|&MjUTnR(W$`eo+vhC@0sCl4$K**<l_g7s-lf?`aE
zn-U*hinRE|D$3B*Z{I&_%kTewyT3BM?!Qwzd(Um14dVL`<n=GOctY^Xle=uK-R_C%
z*E!sT@{9MU3-xYSmr@q5c~<Vac~{)kS608WejVRmTe|f0Ytusoa<>m{)R<9wa6y5Q
z2uu7r1*z?8=6cNcZxTOqW?jOhcQ@|+WB+Cz;LXS+$BZj4O91mY0|O%vFKGm^&~r8`
aBxj@L>Hu$6HjrvYAPfQ0r-0d=fdK$#<mfH{

literal 0
HcmV?d00001

diff --git a/tests.py b/tests.py
index 71ca0b97..ff4fb41b 100644
--- a/tests.py
+++ b/tests.py
@@ -1,13 +1,26 @@
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
+import os
 import unittest
 from glob import glob
-import os
+
+from lxml import etree
 
 import parsedmarc
 import parsedmarc.utils
 
 
+def minify_xml(xml_string):
+    parser = etree.XMLParser(remove_blank_text=True)
+    tree = etree.fromstring(xml_string.encode('utf-8'), parser)
+    return etree.tostring(tree, pretty_print=False).decode('utf-8')
+
+def compare_xml(xml1, xml2):
+    parser = etree.XMLParser(remove_blank_text=True)
+    tree1 = etree.fromstring(xml1.encode('utf-8'), parser)
+    tree2 = etree.fromstring(xml2.encode('utf-8'), parser)
+    return etree.tostring(tree1) == etree.tostring(tree2)
+
 class Test(unittest.TestCase):
     def testBase64Decoding(self):
         """Test base64 decoding"""
@@ -26,6 +39,66 @@ def testPSLDownload(self):
         result = parsedmarc.utils.get_base_domain(subdomain)
         assert result == "c.akamaiedge.net"
 
+    def testExtractReportXMLComparator(self):
+        """Test XML comparator function"""
+        print()
+        xmlnice = open("samples/extract_report/nice-input.xml").read()
+        print(xmlnice)
+        xmlchanged = minify_xml(open("samples/extract_report/changed-input.xml").read())
+        print(xmlchanged)
+        self.assertTrue(compare_xml(xmlnice, xmlnice))
+        self.assertTrue(compare_xml(xmlchanged, xmlchanged))
+        self.assertFalse(compare_xml(xmlnice, xmlchanged))
+        self.assertFalse(compare_xml(xmlchanged, xmlnice))
+        print("Passed!")
+
+    def testExtractReportBytes(self):
+        """Test extract report function for bytes string input"""
+        print()
+        file = "samples/extract_report/nice-input.xml"
+        with open(file, 'rb') as f:
+            data = f.read()
+        print("Testing {0}: " .format(file), end="")
+        xmlout = parsedmarc.extract_report(data)
+        xmlin = open("samples/extract_report/nice-input.xml").read()
+        self.assertTrue(compare_xml(xmlout, xmlin))
+        print("Passed!")
+
+    def testExtractReportXML(self):
+        """Test extract report function for XML input"""
+        print()
+        file = "samples/extract_report/nice-input.xml"
+        print("Testing {0}: " .format(file), end="")
+        xmlout = parsedmarc.extract_report(file)
+        xmlin = open("samples/extract_report/nice-input.xml").read()
+        self.assertTrue(compare_xml(xmlout, xmlin))
+        print("Passed!")
+
+    def testExtractReportGZip(self):
+        """Test extract report function for gzip input"""
+        print()
+        file = "samples/extract_report/nice-input.xml.gz"
+        print("Testing {0}: " .format(file), end="")
+        xmlout = parsedmarc.extract_report(file)
+        xmlin = open("samples/extract_report/nice-input.xml").read()
+        self.assertTrue(compare_xml(xmlout, xmlin))
+        print("Passed!")
+
+    def testExtractReportZip(self):
+        """Test extract report function for zip input"""
+        print()
+        file = "samples/extract_report/nice-input.xml.zip"
+        print("Testing {0}: " .format(file), end="")
+        xmlout = parsedmarc.extract_report(file)
+        print(xmlout)
+        xmlin = minify_xml(open("samples/extract_report/nice-input.xml").read())
+        print(xmlin)
+        self.assertTrue(compare_xml(xmlout, xmlin))
+        xmlin = minify_xml(open("samples/extract_report/changed-input.xml").read())
+        print(xmlin)
+        self.assertFalse(compare_xml(xmlout, xmlin))
+        print("Passed!")
+
     def testAggregateSamples(self):
         """Test sample aggregate/rua DMARC reports"""
         print()