From 0e2636225e7ffdb2ca7705075da665cab047a0c3 Mon Sep 17 00:00:00 2001 From: Ola Thoresen Date: Thu, 21 Jan 2021 08:24:44 +0100 Subject: [PATCH 1/3] Modifying some log-levels to INFO --- parsedmarc/__init__.py | 4 ++-- parsedmarc/cli.py | 2 ++ parsedmarc/elastic.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index ca4f1e7..cde57c9 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -943,7 +943,7 @@ def get_dmarc_reports_from_mbox(input_, nameservers=None, dns_timeout=2.0, input_)) for i in range(len(message_keys)): message_key = message_keys[i] - logger.debug("Processing message {0} of {1}".format( + logger.info("Processing message {0} of {1}".format( i+1, total_messages )) msg_content = mbox.get_string(message_key) @@ -1071,7 +1071,7 @@ def get_dmarc_reports_from_inbox(connection=None, reports_folder)) for i in range(len(messages)): msg_uid = messages[i] - logger.debug("Processing message {0} of {1}: UID {2}".format( + logger.info("Processing message {0} of {1}: UID {2}".format( i+1, total_messages, msg_uid )) diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py index e9119e0..752eacd 100644 --- a/parsedmarc/cli.py +++ b/parsedmarc/cli.py @@ -490,6 +490,8 @@ def _main(): logger.error("You must supply input files, or an IMAP configuration") exit(1) + logger.info("Starting dmarcparse") + if opts.save_aggregate or opts.save_forensic: try: if opts.elasticsearch_hosts: diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py index b448f28..3f2d8a2 100644 --- a/parsedmarc/elastic.py +++ b/parsedmarc/elastic.py @@ -295,7 +295,7 @@ def save_aggregate_report_to_elasticsearch(aggregate_report, Raises: AlreadySaved """ - logger.debug("Saving aggregate report to Elasticsearch") + logger.info("Saving aggregate report to Elasticsearch") aggregate_report = aggregate_report.copy() metadata = aggregate_report["report_metadata"] org_name = metadata["org_name"] @@ -423,7 +423,7 @@ def save_forensic_report_to_elasticsearch(forensic_report, AlreadySaved """ - logger.debug("Saving forensic report to Elasticsearch") + logger.info("Saving forensic report to Elasticsearch") forensic_report = forensic_report.copy() sample_date = None if forensic_report["parsed_sample"]["date"] is not None: From a00cee8ba4c493f37194e948a5de55655307fb86 Mon Sep 17 00:00:00 2001 From: Ola Thoresen Date: Fri, 22 Jan 2021 10:38:04 +0100 Subject: [PATCH 2/3] Adding a log line to see the sender of a report when it is parsed --- parsedmarc/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index cde57c9..5ac6965 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -776,6 +776,7 @@ def parse_report_email(input_, offline=False, nameservers=None, subject = None feedback_report = None sample = None + logger.info("Parsing mail from {0}".format(msg_headers["From"])) if "Subject" in msg_headers: subject = msg_headers["Subject"] for part in msg.walk(): From c853c470879ad2ba2cc56595197cb9fe9f2927d9 Mon Sep 17 00:00:00 2001 From: Ola Thoresen Date: Fri, 22 Jan 2021 15:06:35 +0100 Subject: [PATCH 3/3] Ensuring mail from is set --- parsedmarc/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 5ac6965..73c0130 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -776,7 +776,8 @@ def parse_report_email(input_, offline=False, nameservers=None, subject = None feedback_report = None sample = None - logger.info("Parsing mail from {0}".format(msg_headers["From"])) + if "From" in msg_headers: + logger.info("Parsing mail from {0}".format(msg_headers["From"])) if "Subject" in msg_headers: subject = msg_headers["Subject"] for part in msg.walk():