Actually save source_tye and source_name to Elasticsearch and Opensearch

domainaware · Apr 1, 2024 · d6128ea · d6128ea
1 parent 36eedcb
commit d6128ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
@@ -413,7 +413,7 @@ def parse_aggregate_report_xml(
     Args:
         xml (str): A string of DMARC aggregate report XML
         ip_db_path (str): Path to a MMDB file from MaxMind or DBIP
-         always_use_local_files (bool): Do not download files
+        always_use_local_files (bool): Do not download files
         reverse_dns_map_path (str): Path to a reverse DNS map file
         reverse_dns_map_url (str): URL to a reverse DNS map file
         offline (bool): Do not query online for geolocation or DNS

diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py
@@ -60,7 +60,7 @@ class Index:
     source_ip_address = Ip()
     source_country = Text()
     source_reverse_dns = Text()
-    source_Base_domain = Text()
+    source_base_domain = Text()
     source_type = Text()
     source_name = Text()
     message_count = Integer
@@ -442,6 +442,8 @@ def save_aggregate_report_to_elasticsearch(aggregate_report,
             source_country=record["source"]["country"],
             source_reverse_dns=record["source"]["reverse_dns"],
             source_base_domain=record["source"]["base_domain"],
+            source_type=record["source"]["type"],
+            source_name=record["source"]["name"],
             message_count=record["count"],
             disposition=record["policy_evaluated"]["disposition"],
             dkim_aligned=record["policy_evaluated"]["dkim"] is not None and

diff --git a/parsedmarc/opensearch.py b/parsedmarc/opensearch.py
@@ -59,7 +59,7 @@ class Index:
     source_ip_address = Ip()
     source_country = Text()
     source_reverse_dns = Text()
-    source_Base_domain = Text()
+    source_base_domain = Text()
     source_type = Text()
     source_name = Text()
     message_count = Integer
@@ -438,6 +438,8 @@ def save_aggregate_report_to_opensearch(aggregate_report,
             source_country=record["source"]["country"],
             source_reverse_dns=record["source"]["reverse_dns"],
             source_base_domain=record["source"]["base_domain"],
+            source_type=record["source"]["type"],
+            source_name=record["source"]["name"],
             message_count=record["count"],
             disposition=record["policy_evaluated"]["disposition"],
             dkim_aligned=record["policy_evaluated"]["dkim"] is not None and