DMARCReporting 0.2.1__tar.gz → 0.3.1__tar.gz

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.1"
+__version__ = "0.3.1"
 
 import argparse
 from DMARCReporting.cli import CLI

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting/cli.py

@@ -1,12 +1,10 @@
-
-from os.path import join
 import io
 
 from DMARCReporting.decompressor import DecompressorFactory
 from DMARCReporting.parser import DMARCRuaParser
 from DMARCReporting.renderer import ConsoleRenderer, CSVRenderer
 from DMARCReporting.dns import DNS
-from DMARCReporting.FileLister import FileLister
+from DMARCReporting.filelister import FileLister
 
 
 class CLI():
@@ -14,14 +12,17 @@ class CLI():
         files = FileLister().list(input_dir)
 
         parser = DMARCRuaParser(DNS())
-        renderer = ConsoleRenderer()
         all_data = []
 
         for file in files:
-            file_path = join(input_dir, file)
-            report = DecompressorFactory.create(file_path).decompress(file_path)
-            data = parser.parse(io.BytesIO(report), include_all=show_all)
-            all_data += [[*row, file] for row in data]
+            try:
+                report = DecompressorFactory.create(file).decompress(file)
+                data = parser.parse(io.BytesIO(report), include_all=show_all)
+                all_data += [[*row, file] for row in data]
+            except Exception as e:
+                print(f"Error processing file {file}: {e}")
+
+        renderer = ConsoleRenderer()
         renderer.render("All", all_data)
 
         if csv_output_file:

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting/constants.py

@@ -1,4 +1,6 @@
 headers = [
+    "Begin Date",
+    "End Date",
     "Source IP",
     "Source Host",
     "Payload From (From:)",

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting/decompressor.py

@@ -1,5 +1,6 @@
 import gzip
 import zipfile
+import zlib
 
 
 class DecompressorFactory():
@@ -13,8 +14,19 @@ class DecompressorFactory():
 
 class GZipDecompressor():
     def decompress(self, gzip_file_path):
-        with gzip.open(gzip_file_path, 'rb') as f:
-            return f.read()
+        try:
+            with gzip.open(gzip_file_path, 'rb') as f:
+                return f.read()
+        except gzip.BadGzipFile:
+            return self._decompress_with_zlib(gzip_file_path)
+
+    def _decompress_with_zlib(self, gzip_file_path):
+        with open(gzip_file_path, 'rb') as f:
+            do = zlib.decompressobj(wbits=31)
+            data = do.decompress(f.read())
+            remainder = do.unused_data
+            f.seek(f.tell() - len(remainder))
+            return data
 
 
 class ZipDecompressor():

DMARCReporting-0.2.1/DMARCReporting/FileLister.py → dmarcreporting-0.3.1/DMARCReporting/filelister.py

@@ -1,4 +1,3 @@
-
 from os import listdir
 from os.path import isfile
 from os.path import join
@@ -8,7 +7,7 @@ import pathlib
 class FileLister():
     def list(self, input_dir):
         return sorted([
-            f for f in listdir(input_dir) if self._is_zip_or_gz_file(input_dir, f)
+            join(input_dir, f) for f in listdir(input_dir) if self._is_zip_or_gz_file(input_dir, f)
         ])
 
     def _is_zip_or_gz_file(self, input_dir, file_name):

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting/parser.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from lxml import etree as ET
 
 xpath_all = ".//record"
@@ -18,6 +20,9 @@ class DMARCRuaParser:
 
     def parse(self, rua_report, include_all=False):
         root = ET.parse(rua_report)
+
+        dates = self._parse_dates(root)
+
         records = root.xpath(xpath_all if include_all else xpath_failed)
         data = []
         for record in records:
@@ -29,6 +34,8 @@ class DMARCRuaParser:
 
             data.append(
                 [
+                    dates["begin"],
+                    dates["end"],
                     row["source_ip"],
                     row["source_host"],
                     payload_from,
@@ -43,6 +50,16 @@ class DMARCRuaParser:
             )
         return data
 
+    def _parse_dates(self, root):
+        result = {}
+
+        begin = int(root.xpath("/feedback/report_metadata/date_range/begin/text()")[0])
+        end = int(root.xpath("/feedback/report_metadata/date_range/end/text()")[0])
+
+        result["begin"] = datetime.fromtimestamp(begin).isoformat()
+        result["end"] = datetime.fromtimestamp(end).isoformat()
+        return result
+
     def _parse_row(self, record):
         result = {}
 

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: DMARCReporting
-Version: 0.2.1
+Version: 0.3.1
 Summary: Simple tool to extract error reports from DMARC files
 Home-page: https://github.com/MozaicWorks/DMARCReporting
 Author: Mozaic Works
@@ -13,6 +13,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lxml
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DMARCReporting ![Build Status](https://github.com/mozaicworks/DMARCReporting/actions/workflows/build.yml/badge.svg?event=push)
 

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/DMARCReporting.egg-info/SOURCES.txt

@@ -2,13 +2,13 @@ LICENSE
 README.md
 setup.cfg
 setup.py
-DMARCReporting/FileLister.py
 DMARCReporting/__init__.py
 DMARCReporting/__main__.py
 DMARCReporting/cli.py
 DMARCReporting/constants.py
 DMARCReporting/decompressor.py
 DMARCReporting/dns.py
+DMARCReporting/filelister.py
 DMARCReporting/parser.py
 DMARCReporting/renderer.py
 DMARCReporting.egg-info/PKG-INFO
@@ -17,12 +17,12 @@ DMARCReporting.egg-info/dependency_links.txt
 DMARCReporting.egg-info/entry_points.txt
 DMARCReporting.egg-info/requires.txt
 DMARCReporting.egg-info/top_level.txt
-tests/test_FileLister.py
 tests/test_acceptance.py
 tests/test_console_renderer.py
 tests/test_csv_renderer.py
 tests/test_decompressor.py
 tests/test_dns.py
+tests/test_filelister.py
 tests/test_parser_dkim.py
 tests/test_parser_dmarc.py
 tests/test_parser_spf.py

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: DMARCReporting
-Version: 0.2.1
+Version: 0.3.1
 Summary: Simple tool to extract error reports from DMARC files
 Home-page: https://github.com/MozaicWorks/DMARCReporting
 Author: Mozaic Works
@@ -13,6 +13,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lxml
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DMARCReporting ![Build Status](https://github.com/mozaicworks/DMARCReporting/actions/workflows/build.yml/badge.svg?event=push)
 

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/setup.py

@@ -1,6 +1,8 @@
 import pathlib
 from setuptools import setup, find_packages
 
+import DMARCReporting
+
 # The directory containing this file
 HERE = pathlib.Path(__file__).parent
 
@@ -10,7 +12,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="DMARCReporting",
-    version="0.2.1",
+    version=DMARCReporting.__version__,
     description="Simple tool to extract error reports from DMARC files",
     long_description=README,
     long_description_content_type="text/markdown",

dmarcreporting-0.3.1/tests/test_acceptance.py

@@ -0,0 +1,122 @@
+import os
+import sys
+import io
+import time
+from unittest.mock import patch
+
+import pytest
+
+from .context import DMARCReporting  # noqa F401
+from DMARCReporting.cli import CLI
+
+test_tz = 'Europe/Brussels'
+env_tz = ''
+
+
+@pytest.fixture
+def setup_timezone():
+    env_tz = time.tzname[0]
+    print()
+    print(f"save current timezone: {env_tz}")
+    print(f"set timezone for tests to {test_tz}")
+    os.environ['TZ'] = test_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+    yield
+    print()
+    print(f"reset timezone back to {env_tz}")
+    os.environ['TZ'] = env_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+
+
+@patch('socket.gethostbyaddr')
+def test_render(gethostbyaddr_mock, setup_timezone):
+    gethostbyaddr_mock.side_effect = [
+        ("Unknown host", [], []),
+        ("208-90-221-45.static.flhsi.com", [], []),
+        ("Unknown host", [], []),
+        ("208-90-221-45.static.flhsi.com", [], []),
+    ]
+    try:
+        output = io.StringIO()
+        sys.stdout = output
+
+        cli = CLI()
+        cli.execute("./samples")
+
+        expected = (
+            "Begin Date           End Date             Source IP      Source Host                     Payload From (From:)    Envelop From (MAIL FROM)    DMARC    DKIM Align    DKIM Auth    SPF Align    SPF Auth      Count  File\n"  # noqa E501
+            "-------------------  -------------------  -------------  ------------------------------  ----------------------  --------------------------  -------  ------------  -----------  -----------  ----------  -------  ------------------------\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  80.96.161.193  Unknown host                    bellous.com             bellous.com                 none     pass          pass         fail         fail              3  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  208.90.221.45  208-90-221-45.static.flhsi.com  bellous.com             calendar.yambo.com          none     pass          pass         fail         pass             32  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  80.96.161.193  Unknown host                    disicious.com           disicious.com               none     pass          pass         fail         fail              3  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  208.90.221.45  208-90-221-45.static.flhsi.com  disicious.com           calendar.trumbee.com        none     pass          pass         fail         pass             32  ./samples/report.xml.zip\n"  # noqa E501
+        )
+        actual = output.getvalue()
+
+        assert expected == actual
+
+    finally:
+        sys.stdout = sys.__stdout__
+
+
+@patch('socket.gethostbyaddr')
+def test_render_all(gethostbyaddr_mock, setup_timezone):
+    gethostbyaddr_mock.side_effect = [
+        ("smtp.bellous.com", [], []),
+        ("smtp.bellous.com", [], []),
+        ("smtp.bellous.com", [], []),
+        ("smtp.bellous.com", [], []),
+        ("smtp.bellous.com", [], []),
+        ("Unknown host", [], []),
+        ("208-90-221-45.static.flhsi.com", [], []),
+        ("smtp.disicious.com", [], []),
+        ("smtp.disicious.com", [], []),
+        ("smtp.disicious.com", [], []),
+        ("smtp.disicious.com", [], []),
+        ("smtp.disicious.com", [], []),
+        ("Unknown host", [], []),
+        ("208-90-221-45.static.flhsi.com", [], []),
+        ("smtp.abbove.com", [], []),
+        ("smtp.abbove.com", [], []),
+        ("smtp.abbove.com", [], []),
+        ("smtp.abbove.com", [], []),
+        ("smtp.abbove.com", [], []),
+    ]
+    try:
+        output = io.StringIO()
+        sys.stdout = output
+
+        cli = CLI()
+        cli.execute("./samples", csv_output_file=None, show_all=True)
+
+        expected = (
+            "Begin Date           End Date             Source IP       Source Host                     Payload From (From:)    Envelop From (MAIL FROM)    DMARC    DKIM Align    DKIM Auth    SPF Align    SPF Auth      Count  File\n"  # noqa E501
+            "-------------------  -------------------  --------------  ------------------------------  ----------------------  --------------------------  -------  ------------  -----------  -----------  ----------  -------  ----------------------------------\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  207.90.221.45   smtp.bellous.com                bellous.com             bellous.com                 none     pass          pass         pass         pass              8  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  207.86.220.40   smtp.bellous.com                bellous.com             bellous.com                 none     pass          pass         pass         pass             22  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  198.3.186.1     smtp.bellous.com                bellous.com             mail.bellous.com            none     pass          pass         pass         pass             68  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  210.81.222.70   smtp.bellous.com                bellous.com             bellous.com                 none     pass          pass         pass         pass              6  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  197.3.177.11    smtp.bellous.com                bellous.com             mail.bellous.com            none     pass          pass         pass         pass             81  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  80.96.161.193   Unknown host                    bellous.com             bellous.com                 none     pass          pass         fail         fail              3  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  208.90.221.45   208-90-221-45.static.flhsi.com  bellous.com             calendar.yambo.com          none     pass          pass         fail         pass             32  ./samples/report.xml.gz\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  207.90.221.45   smtp.disicious.com              disicious.com           disicious.com               none     pass          pass         pass         pass              8  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  207.86.220.40   smtp.disicious.com              disicious.com           disicious.com               none     pass          pass         pass         pass             22  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  198.3.186.1     smtp.disicious.com              disicious.com           mail.disicious.com          none     pass          pass         pass         pass             68  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  210.81.222.70   smtp.disicious.com              disicious.com           disicious.com               none     pass          pass         pass         pass              6  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  197.3.177.11    smtp.disicious.com              disicious.com           mail.disicious.com          none     pass          pass         pass         pass             81  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  80.96.161.193   Unknown host                    disicious.com           disicious.com               none     pass          pass         fail         fail              3  ./samples/report.xml.zip\n"  # noqa E501
+            "2021-11-25T01:00:00  2021-11-26T00:59:59  208.90.221.45   208-90-221-45.static.flhsi.com  disicious.com           calendar.trumbee.com        none     pass          pass         fail         pass             32  ./samples/report.xml.zip\n"  # noqa E501
+            "2023-08-30T02:00:00  2023-08-31T01:59:59  209.85.208.179  smtp.abbove.com                 abbove.com              abbove.com                  none     pass          pass         pass         pass              1  ./samples/trailing_garbage1.xml.gz\n"  # noqa E501
+            "2023-08-30T02:00:00  2023-08-31T01:59:59  209.85.208.170  smtp.abbove.com                 abbove.com              abbove.com                  none     pass          pass         pass         pass              1  ./samples/trailing_garbage1.xml.gz\n"  # noqa E501
+            "2023-08-30T02:00:00  2023-08-31T01:59:59  209.85.208.181  smtp.abbove.com                 abbove.com              abbove.com                  none     pass          pass         pass         pass              1  ./samples/trailing_garbage1.xml.gz\n"  # noqa E501
+            "2023-08-31T02:00:00  2023-09-01T01:59:59  209.85.219.176  smtp.abbove.com                 abbove.com              abbove.com                  none     pass          pass         pass         pass              1  ./samples/trailing_garbage2.xml.gz\n"  # noqa E501
+            "2023-08-31T02:00:00  2023-09-01T01:59:59  209.85.219.178  smtp.abbove.com                 abbove.com              abbove.com                  none     pass          pass         pass         pass              1  ./samples/trailing_garbage2.xml.gz\n"  # noqa E501
+        )
+        actual = output.getvalue()
+
+        assert expected == actual
+
+    finally:
+        sys.stdout = sys.__stdout__

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_console_renderer.py

@@ -31,6 +31,8 @@ def test_render_with_data():
 
         data = [
             [
+                "begin_date",
+                "end_date",
                 "source_ip",
                 "source_host",
                 "payload_from",
@@ -49,9 +51,9 @@ def test_render_with_data():
         sut.render("ruareport_file", data)
 
         expected = (
-            "Source IP    Source Host    Payload From (From:)    Envelop From (MAIL FROM)    DMARC              DKIM Align    DKIM Auth    SPF Align    SPF Auth      Count  File\n"  # noqa E501
-            "-----------  -------------  ----------------------  --------------------------  -----------------  ------------  -----------  -----------  ----------  -------  --------------\n"  # noqa E501
-            "source_ip    source_host    payload_from            envelop_from                dmarc_disposition  dkim_aligned  dkim_auth    spf_aligned  spf_auth         42  ruareport_file\n"  # noqa E501
+            "Begin Date    End Date    Source IP    Source Host    Payload From (From:)    Envelop From (MAIL FROM)    DMARC              DKIM Align    DKIM Auth    SPF Align    SPF Auth      Count  File\n"  # noqa E501
+            "------------  ----------  -----------  -------------  ----------------------  --------------------------  -----------------  ------------  -----------  -----------  ----------  -------  --------------\n"  # noqa E501
+            "begin_date    end_date    source_ip    source_host    payload_from            envelop_from                dmarc_disposition  dkim_aligned  dkim_auth    spf_aligned  spf_auth         42  ruareport_file\n"  # noqa E501
         )
         actual = output.getvalue()
 

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_csv_renderer.py

@@ -15,7 +15,7 @@ def test_render_without_data():
         sut = CSVRenderer()
         sut.render(csv_file, data)
 
-        expected = "Source IP,Source Host,Payload From (From:),Envelop From (MAIL FROM),DMARC,DKIM Align,DKIM Auth,SPF Align,SPF Auth,Count,File\n"  # noqa E501
+        expected = "Begin Date,End Date,Source IP,Source Host,Payload From (From:),Envelop From (MAIL FROM),DMARC,DKIM Align,DKIM Auth,SPF Align,SPF Auth,Count,File\n"  # noqa E501
         actual = open(csv_file, "r").read()
 
         assert expected == actual
@@ -31,6 +31,8 @@ def test_render_with_data():
 
         data = [
             [
+                "begin_date",
+                "end_date",
                 "source_ip",
                 "source_host",
                 "payload_from",
@@ -49,8 +51,8 @@ def test_render_with_data():
         sut.render(csv_file, data)
 
         expected = (
-            "Source IP,Source Host,Payload From (From:),Envelop From (MAIL FROM),DMARC,DKIM Align,DKIM Auth,SPF Align,SPF Auth,Count,File\n"  # noqa E501
-            "source_ip,source_host,payload_from,envelop_from,dmarc_disposition,dkim_aligned,dkim_auth,spf_aligned,spf_auth,42,ruareport_file\n"  # noqa E501
+            "Begin Date,End Date,Source IP,Source Host,Payload From (From:),Envelop From (MAIL FROM),DMARC,DKIM Align,DKIM Auth,SPF Align,SPF Auth,Count,File\n"  # noqa E501
+            "begin_date,end_date,source_ip,source_host,payload_from,envelop_from,dmarc_disposition,dkim_aligned,dkim_auth,spf_aligned,spf_auth,42,ruareport_file\n"  # noqa E501
         )
         actual = actual = open(csv_file, "r").read()
 

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_decompressor.py

@@ -30,7 +30,6 @@ def test_factory_raises_not_implemented():
 def test_decompress_gzip():
     sut = GZipDecompressor()
     actual = sut.decompress("./tests/data/sample.txt.gz")
-
     assert "Hello world, gzip!" == actual.decode("utf-8")
 
 
@@ -39,3 +38,10 @@ def test_decompress_zip():
     actual = sut.decompress("./tests/data/sample.txt.zip")
 
     assert "Hello world, zip!" == actual.decode("utf-8")
+
+
+def test_decompress_trailing_garbage_gzip():
+    sut = GZipDecompressor()
+    actual = sut.decompress("./tests/data/trailing_garbage.xml.gz")
+    expected = open("./tests/data/trailing_garbage.xml", "r").read()
+    assert expected == actual.decode("utf-8")

DMARCReporting-0.2.1/tests/test_FileLister.py → dmarcreporting-0.3.1/tests/test_filelister.py

@@ -1,9 +1,11 @@
-
 import unittest
-from .context import DMARCReporting  # noqa F401
-from DMARCReporting.FileLister import FileLister
 import tempfile
 import os
+from os.path import join
+
+from .context import DMARCReporting  # noqa F401
+from DMARCReporting.filelister import FileLister
+
 from parameterized import parameterized
 
 
@@ -17,19 +19,17 @@ class TestFileLister(unittest.TestCase):
            ("sort_files", ["2.gz", "z.zip", "1.gz", "a.zip"], ["1.gz", "2.gz", "a.zip", "z.zip"]),
            ("only_gz_and_zip_files", ["z.zip", "1.gz", "3.txt", "ttt.jpg"], ["1.gz", "z.zip"]),
        ])
-    def test_file_lister(self, name, filesList, expected):
+    def test_file_lister(self, name, filesList, expectedFilesList):
         def listerFunction(dirName): return FileLister().list(dirName)
 
-        actual = self.list_files_with_function(filesList, listerFunction)
+        # Create temporary directory, temporary files, list them with the lister function, assert, and delete them
+        with tempfile.TemporaryDirectory() as testDir:
+            [self.create_test_file(testDir, fileName) for fileName in filesList]
+            actual = listerFunction(testDir)
+            expected = [join(testDir, f) for f in expectedFilesList]
 
-        self.assertListEqual(expected, actual)
+            self.assertListEqual(expected, actual)
 
     def create_test_file(self, path, filename):
         with open(os.path.join(path, filename), 'w'):
             pass
-
-    def list_files_with_function(self, filesList, listerFunction):
-        ''' Create temporary directory, temporary files, list them with the lister function, and delete them'''
-        with tempfile.TemporaryDirectory() as testDir:
-            [self.create_test_file(testDir, fileName) for fileName in filesList]
-            return listerFunction(testDir)

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_parser_dkim.py

@@ -1,16 +1,44 @@
+import os
 import io
+import time
 
 import pytest
 
 from .context import DMARCReporting  # noqa F401
 from DMARCReporting.parser import DMARCRuaParser
 
+test_tz = 'Europe/Brussels'
+env_tz = ''
+
+
+@pytest.fixture
+def setup_timezone():
+    env_tz = time.tzname[0]
+    print()
+    print(f"save current timezone: {env_tz}")
+    print(f"set timezone for tests to {test_tz}")
+    os.environ['TZ'] = test_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+    yield
+    print()
+    print(f"reset timezone back to {env_tz}")
+    os.environ['TZ'] = env_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+
 
 @pytest.fixture
 def not_authenticated():
     return io.StringIO(
         """
         <feedback>
+            <report_metadata>
+                <date_range>
+                    <begin>1703237232</begin>
+                    <end>1703280196</end>
+                </date_range>
+            </report_metadata>
             <record>
                 <row>
                 <source_ip>201.81.220.40</source_ip>
@@ -44,11 +72,13 @@ class DNSStub:
         return "mail.email.com"
 
 
-def test_when_not_authenticated(not_authenticated):
+def test_when_not_authenticated(not_authenticated, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(not_authenticated)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "201.81.220.40",
             "mail.email.com",
             "email.com",
@@ -69,6 +99,12 @@ def authenticated_two_records():
     return io.StringIO(
         """
         <feedback>
+            <report_metadata>
+                <date_range>
+                    <begin>1703237232</begin>
+                    <end>1703280196</end>
+                </date_range>
+            </report_metadata>
             <record>
                 <row>
                 <source_ip>201.81.220.40</source_ip>
@@ -102,11 +138,13 @@ def authenticated_two_records():
     )
 
 
-def test_when_not_authenticated_having_two_records(authenticated_two_records):
+def test_when_not_authenticated_having_two_records(authenticated_two_records, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(authenticated_two_records)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "201.81.220.40",
             "mail.email.com",
             "email.com",

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_parser_dmarc.py

@@ -1,4 +1,6 @@
+import os
 import io
+import time
 
 import pytest
 
@@ -6,10 +8,37 @@ from .context import DMARCReporting  # noqa F401
 from DMARCReporting.parser import DMARCRuaParser
 
 
+test_tz = 'Europe/Brussels'
+env_tz = ''
+
+
+@pytest.fixture
+def setup_timezone():
+    env_tz = time.tzname[0]
+    print()
+    print(f"save current timezone: {env_tz}")
+    print(f"set timezone for tests to {test_tz}")
+    os.environ['TZ'] = test_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+    yield
+    print()
+    print(f"reset timezone back to {env_tz}")
+    os.environ['TZ'] = env_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+
+
 def rua_report(disposition="none", spf_aligned="pass", dkim_aligned="pass"):
     return io.StringIO(
         """
         <feedback>
+            <report_metadata>
+                <date_range>
+                    <begin>1703237232</begin>
+                    <end>1703280196</end>
+                </date_range>
+            </report_metadata>
             <record>
                 <row>
                 <source_ip>101.0.122.38</source_ip>
@@ -79,11 +108,13 @@ class DNSStub:
         return "mail.email.com"
 
 
-def test_when_dmarc_disposition_quarantine(rua_report_quarantine):
+def test_when_dmarc_disposition_quarantine(rua_report_quarantine, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_quarantine)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "101.0.122.38",
             "mail.email.com",
             "email.com",
@@ -99,17 +130,19 @@ def test_when_dmarc_disposition_quarantine(rua_report_quarantine):
     assert expected == actual
 
 
-def test_when_dmarc_disposition_none(rua_report_none):
+def test_when_dmarc_disposition_none(rua_report_none, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_none)
     assert [] == actual
 
 
-def test_when_dmarc_disposition_reject(rua_report_reject):
+def test_when_dmarc_disposition_reject(rua_report_reject, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_reject)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "101.0.122.38",
             "mail.email.com",
             "email.com",
@@ -125,17 +158,19 @@ def test_when_dmarc_disposition_reject(rua_report_reject):
     assert expected == actual
 
 
-def test_when_spf_and_dkim_aligned(rua_report_spf_and_dkim_aligned):
+def test_when_spf_and_dkim_aligned(rua_report_spf_and_dkim_aligned, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_spf_and_dkim_aligned)
     assert [] == actual
 
 
-def test_when_spf_not_aligned(rua_report_spf_not_aligned):
+def test_when_spf_not_aligned(rua_report_spf_not_aligned, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_spf_not_aligned)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "101.0.122.38",
             "mail.email.com",
             "email.com",
@@ -151,11 +186,13 @@ def test_when_spf_not_aligned(rua_report_spf_not_aligned):
     assert expected == actual
 
 
-def test_when_dkim_not_aligned(rua_report_dkim_not_aligned):
+def test_when_dkim_not_aligned(rua_report_dkim_not_aligned, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(rua_report_dkim_not_aligned)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "101.0.122.38",
             "mail.email.com",
             "email.com",

{DMARCReporting-0.2.1 → dmarcreporting-0.3.1}/tests/test_parser_spf.py

@@ -1,4 +1,6 @@
+import os
 import io
+import time
 
 import pytest
 
@@ -6,11 +8,38 @@ from .context import DMARCReporting  # noqa F401
 from DMARCReporting.parser import DMARCRuaParser
 
 
+test_tz = 'Europe/Brussels'
+env_tz = ''
+
+
+@pytest.fixture
+def setup_timezone():
+    env_tz = time.tzname[0]
+    print()
+    print(f"save current timezone: {env_tz}")
+    print(f"set timezone for tests to {test_tz}")
+    os.environ['TZ'] = test_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+    yield
+    print()
+    print(f"reset timezone back to {env_tz}")
+    os.environ['TZ'] = env_tz
+    time.tzset()
+    print(f"timezone is now {time.tzname[0]}")
+
+
 @pytest.fixture
 def not_authenticated():
     return io.StringIO(
         """
         <feedback>
+            <report_metadata>
+                <date_range>
+                    <begin>1703237232</begin>
+                    <end>1703280196</end>
+                </date_range>
+            </report_metadata>
             <record>
                 <row>
                 <source_ip>201.81.220.40</source_ip>
@@ -43,11 +72,13 @@ class DNSStub:
         return "mail.email.com"
 
 
-def test_when_spf_not_authenticated(not_authenticated):
+def test_when_spf_not_authenticated(not_authenticated, setup_timezone):
     sut = DMARCRuaParser(DNSStub())
     actual = sut.parse(not_authenticated)
     expected = [
         [
+            "2023-12-22T10:27:12",
+            "2023-12-22T22:23:16",
             "201.81.220.40",
             "mail.email.com",
             "email.com",

DMARCReporting-0.2.1/tests/test_acceptance.py

@@ -1,37 +0,0 @@
-import io
-import sys
-from unittest.mock import patch
-
-from .context import DMARCReporting  # noqa F401
-from DMARCReporting.cli import CLI
-
-
-@patch('socket.gethostbyaddr')
-def test_render(gethostbyaddr_mock):
-    gethostbyaddr_mock.side_effect = [
-        ("Unknown host", [], []),
-        ("208-90-221-45.static.flhsi.com", [], []),
-        ("Unknown host", [], []),
-        ("208-90-221-45.static.flhsi.com", [], []),
-    ]
-    try:
-        output = io.StringIO()
-        sys.stdout = output
-
-        cli = CLI()
-        cli.execute("./samples")
-
-        expected = (
-            "Source IP      Source Host                     Payload From (From:)    Envelop From (MAIL FROM)    DMARC    DKIM Align    DKIM Auth    SPF Align    SPF Auth      Count  File\n"  # noqa E501
-            "-------------  ------------------------------  ----------------------  --------------------------  -------  ------------  -----------  -----------  ----------  -------  --------------\n"  # noqa E501
-            "80.96.161.193  Unknown host                    bellous.com             bellous.com                 none     pass          pass         fail         fail              3  report.xml.gz\n"  # noqa E501
-            "208.90.221.45  208-90-221-45.static.flhsi.com  bellous.com             calendar.yambo.com          none     pass          pass         fail         pass             32  report.xml.gz\n"  # noqa E501
-            "80.96.161.193  Unknown host                    disicious.com           disicious.com               none     pass          pass         fail         fail              3  report.xml.zip\n"  # noqa E501
-            "208.90.221.45  208-90-221-45.static.flhsi.com  disicious.com           calendar.trumbee.com        none     pass          pass         fail         pass             32  report.xml.zip\n"  # noqa E501
-        )
-        actual = output.getvalue()
-
-        assert expected == actual
-
-    finally:
-        sys.stdout = sys.__stdout__