diff --git a/app/email_utils.py b/app/email_utils.py index db0142e9..12850b05 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -1451,7 +1451,9 @@ def get_dmarc_status(msg: Message) -> Optional[DmarcCheckResult]: sep = spam_entries[entry_pos].find("(") if sep > -1: spam_entries[entry_pos] = spam_entries[entry_pos][:sep] + for header_value, dmarc_result in DmarcCheckResult.get_string_dict().items(): if header_value in spam_entries: return dmarc_result + return None diff --git a/email_handler.py b/email_handler.py index 7af90060..5342f2ad 100644 --- a/email_handler.py +++ b/email_handler.py @@ -547,6 +547,10 @@ def apply_dmarc_policy( newrelic.agent.record_custom_event( "Custom/dmarc_check", {"result": dmarc_result.name} ) + else: + newrelic.agent.record_custom_event( + "Custom/dmarc_check", {"result": "N/A"} + ) if not DMARC_CHECK_ENABLED or not dmarc_result: return None