Merge branch 'master' of https://github.com/domainaware/parsedmarc

CHANGELOG.md

@@ -11,7 +11,7 @@ Changelog
 8.17.0
 ------
 
-- Ignore duplicate aggregate DMARC reports with the same `org_name` and `report_id` seen within the same hour (Fixes [#539](https://github.com/domainaware/parsedmarc/issues/539))
+- Ignore duplicate aggregate DMARC reports with the same `org_name` and `report_id` seen within the same hour (Fixes #535)
 - Fix saving SMTP TLS reports to OpenSearch (PR #585 closed issue #576)
 - Add 303 entries to `base_reverse_dns_map.csv`
 

docs/source/usage.md

@@ -208,6 +208,8 @@ The full set of configuration options are:
   - `mailbox` - str: The mailbox name. This defaults to the
       current user if using the UsernamePassword auth method, but
       could be a shared mailbox if the user has access to the mailbox
+  - `graph_url` - str: Microsoft Graph URL.  Allows for use of National Clouds (ex Azure Gov)
+      (Default: https://graph.microsoft.com)
   - `token_file` - str: Path to save the token file
       (Default: `.token`)
   - `allow_unencrypted_storage` - bool: Allows the Azure Identity

parsedmarc/__init__.py

@@ -1294,7 +1294,7 @@ def parse_report_email(
                     "is not a valid "
                     "aggregate DMARC report: {1}".format(subject, e)
                 )
-                raise ParserError(error)
+                raise InvalidDMARCReport(error)
 
             except Exception as e:
                 error = "Unable to parse message with " 'subject "{0}": {1}'.format(

parsedmarc/cli.py

@@ -14,6 +14,7 @@ import json
 from ssl import CERT_NONE, create_default_context
 from multiprocessing import Pipe, Process
 import sys
+import http.client
 from tqdm import tqdm
 
 from parsedmarc import (
@@ -48,6 +49,8 @@ from parsedmarc.log import logger
 from parsedmarc.utils import is_mbox, get_reverse_dns
 from parsedmarc import SEEN_AGGREGATE_REPORT_IDS
 
+http.client._MAXHEADERS = 200 # pylint:disable=protected-access
+
 formatter = logging.Formatter(
     fmt="%(levelname)8s:%(filename)s:%(lineno)d:%(message)s",
     datefmt="%Y-%m-%d:%H:%M:%S",
@@ -528,6 +531,7 @@ def _main():
         graph_tenant_id=None,
         graph_mailbox=None,
         graph_allow_unencrypted_storage=False,
+        graph_url="graph.microsoft.com",
         hec=None,
         hec_token=None,
         hec_index=None,
@@ -879,6 +883,9 @@ def _main():
                 )
                 exit(-1)
 
+            if "graph_url" in graph_config:
+                opts.graph_url = graph_config["graph_url"]
+
             if "allow_unencrypted_storage" in graph_config:
                 opts.graph_allow_unencrypted_storage = graph_config.getboolean(
                     "allow_unencrypted_storage"
@@ -1496,6 +1503,7 @@ def _main():
                 password=opts.graph_password,
                 token_file=opts.graph_token_file,
                 allow_unencrypted_storage=opts.graph_allow_unencrypted_storage,
+                graph_url=opts.graph_url,
             )
 
         except Exception:

parsedmarc/mail/graph.py

@@ -89,6 +89,7 @@ class MSGraphConnection(MailboxConnection):
         self,
         auth_method: str,
         mailbox: str,
+        graph_url: str,
         client_id: str,
         client_secret: str,
         username: str,
@@ -108,7 +109,10 @@ class MSGraphConnection(MailboxConnection):
             token_path=token_path,
             allow_unencrypted_storage=allow_unencrypted_storage,
         )
-        client_params = {"credential": credential}
+        client_params = {
+            "credential": credential,
+            "cloud": graph_url,
+        }
         if not isinstance(credential, ClientSecretCredential):
             scopes = ["Mail.ReadWrite"]
             # Detect if mailbox is shared