mirror of
https://github.com/domainaware/parsedmarc.git
synced 2026-11-06 08:49:23 +00:00
* Upgrade ruff to 0.16.0 and pyright to 1.1.411; convert to f-strings ruff 0.16.0 expanded the default lint rule selection well beyond the long-standing E4/E7/E9/F, so [tool.ruff.lint] now selects the rule set explicitly: the pre-0.16 defaults plus the modern-type-hint UP rules and the two f-string rules (UP030/UP032). All 352 UP030/UP032 findings were auto-fixed; conversions requiring Python 3.12 f-string quote reuse were conservatively left as .format() by ruff (verified: the whole package and test suite byte-compile under CPython 3.10.20, the oldest CI version). Adopting the other newly-default rule families (BLE, SIM, C4, DTZ, I, ...) is deferred as a deliberate per-family decision. ruff format with 0.16.0 also now formats Python code fences in Markdown, which reformatted one block in parsedmarc/resources/maps/AGENTS.md. ruff check, ruff format --check, pyright (0 errors/warnings), and the full test suite (775 passed) are green on the new versions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address Copilot review findings on the f-string conversion - Rewrite messages that used backslash line continuations inside string literals, which embedded the source indentation as literal whitespace in the logged/raised text: the duplicate search-error messages in the Elasticsearch and OpenSearch outputs, the 'since'-option warning (which also implicitly concatenated "24hrs" and "SMTP" with no separator) and the IMAP 'since' debug line, and the missing-org_name KeyError message. - Build the Splunk HEC newline-delimited payloads by appending to a list and joining once instead of quadratic string concatenation in a loop. Declined: switching the webhook output's logger.error to logger.exception — the single-line ERROR without a traceback is the deliberate house pattern for batch-resilient sinks, and changing log verbosity is out of scope for this refactor PR. ruff check/format, pyright (0 errors/warnings), 775 tests, and a CPython 3.10 compileall all pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
232 lines
8.5 KiB
Python
232 lines
8.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import socket
|
|
from typing import Any
|
|
from urllib.parse import urlparse
|
|
|
|
import httpx
|
|
|
|
from parsedmarc.constants import USER_AGENT
|
|
from parsedmarc.log import logger
|
|
from parsedmarc.utils import human_timestamp_to_unix_timestamp
|
|
|
|
|
|
class SplunkError(RuntimeError):
|
|
"""Raised when a Splunk API error occurs"""
|
|
|
|
|
|
class HECClient(object):
|
|
"""A client for a Splunk HTTP Events Collector (HEC)"""
|
|
|
|
# http://docs.splunk.com/Documentation/Splunk/latest/Data/AboutHEC
|
|
# http://docs.splunk.com/Documentation/Splunk/latest/RESTREF/RESTinput#services.2Fcollector
|
|
|
|
def __init__(
|
|
self,
|
|
url: str,
|
|
access_token: str,
|
|
index: str,
|
|
source: str = "parsedmarc",
|
|
verify=True,
|
|
timeout=60,
|
|
):
|
|
"""
|
|
Initializes the HECClient
|
|
|
|
Args:
|
|
url (str): The URL of the HEC
|
|
access_token (str): The HEC access token
|
|
index (str): The name of the index
|
|
source (str): The source name
|
|
verify (bool): Verify SSL certificates
|
|
timeout (float): Number of seconds to wait for the server to send
|
|
data before giving up
|
|
"""
|
|
parsed_url = urlparse(url)
|
|
self.url = (
|
|
f"{parsed_url.scheme}://{parsed_url.netloc}/services/collector/event/1.0"
|
|
)
|
|
self.access_token = access_token.lstrip("Splunk ")
|
|
self.index = index
|
|
self.host = socket.getfqdn()
|
|
self.source = source
|
|
self.timeout = timeout
|
|
self.verify = verify
|
|
self._common_data: dict[str, str | int | float | dict] = dict(
|
|
host=self.host, source=self.source, index=self.index
|
|
)
|
|
|
|
self.session = httpx.Client(
|
|
headers={
|
|
"User-Agent": USER_AGENT,
|
|
"Authorization": f"Splunk {self.access_token}",
|
|
},
|
|
verify=self.verify,
|
|
follow_redirects=True,
|
|
)
|
|
|
|
def save_aggregate_reports_to_splunk(
|
|
self,
|
|
aggregate_reports: list[dict[str, Any]] | dict[str, Any],
|
|
):
|
|
"""
|
|
Saves aggregate DMARC reports to Splunk
|
|
|
|
Args:
|
|
aggregate_reports: A list of aggregate report dictionaries
|
|
to save in Splunk
|
|
|
|
"""
|
|
logger.debug("Saving aggregate reports to Splunk")
|
|
if isinstance(aggregate_reports, dict):
|
|
aggregate_reports = [aggregate_reports]
|
|
|
|
if len(aggregate_reports) < 1:
|
|
return
|
|
|
|
data = self._common_data.copy()
|
|
json_lines: list[str] = []
|
|
for report in aggregate_reports:
|
|
for record in report["records"]:
|
|
new_report: dict[str, str | int | float | dict] = dict()
|
|
for metadata in report["report_metadata"]:
|
|
new_report[metadata] = report["report_metadata"][metadata]
|
|
new_report["interval_begin"] = record["interval_begin"]
|
|
new_report["interval_end"] = record["interval_end"]
|
|
new_report["normalized_timespan"] = record["normalized_timespan"]
|
|
new_report["published_policy"] = report["policy_published"]
|
|
new_report["source_ip_address"] = record["source"]["ip_address"]
|
|
new_report["source_country"] = record["source"]["country"]
|
|
new_report["source_reverse_dns"] = record["source"]["reverse_dns"]
|
|
new_report["source_base_domain"] = record["source"]["base_domain"]
|
|
new_report["source_type"] = record["source"]["type"]
|
|
new_report["source_name"] = record["source"]["name"]
|
|
new_report["source_asn"] = record["source"]["asn"]
|
|
new_report["source_as_name"] = record["source"]["as_name"]
|
|
new_report["source_as_domain"] = record["source"]["as_domain"]
|
|
new_report["message_count"] = record["count"]
|
|
new_report["disposition"] = record["policy_evaluated"]["disposition"]
|
|
new_report["spf_aligned"] = record["alignment"]["spf"]
|
|
new_report["dkim_aligned"] = record["alignment"]["dkim"]
|
|
new_report["passed_dmarc"] = record["alignment"]["dmarc"]
|
|
new_report["header_from"] = record["identifiers"]["header_from"]
|
|
new_report["envelope_from"] = record["identifiers"]["envelope_from"]
|
|
if "dkim" in record["auth_results"]:
|
|
new_report["dkim_results"] = record["auth_results"]["dkim"]
|
|
if "spf" in record["auth_results"]:
|
|
new_report["spf_results"] = record["auth_results"]["spf"]
|
|
|
|
data["sourcetype"] = "dmarc:aggregate"
|
|
# interval_begin is a UTC wall-clock string; assume_utc keeps
|
|
# it from being re-interpreted as local time on non-UTC hosts.
|
|
timestamp = human_timestamp_to_unix_timestamp(
|
|
new_report["interval_begin"], assume_utc=True
|
|
)
|
|
data["time"] = timestamp
|
|
data["event"] = new_report.copy()
|
|
json_lines.append(f"{json.dumps(data)}\n")
|
|
|
|
if not self.verify:
|
|
logger.debug("Skipping certificate verification for Splunk HEC")
|
|
try:
|
|
response = self.session.post(
|
|
self.url, content="".join(json_lines), timeout=self.timeout
|
|
)
|
|
response = response.json()
|
|
except Exception as e:
|
|
raise SplunkError(e.__str__())
|
|
if response["code"] != 0:
|
|
raise SplunkError(response["text"])
|
|
|
|
def save_failure_reports_to_splunk(
|
|
self,
|
|
failure_reports: list[dict[str, Any]] | dict[str, Any],
|
|
):
|
|
"""
|
|
Saves failure DMARC reports to Splunk
|
|
|
|
Args:
|
|
failure_reports (list): A list of failure report dictionaries
|
|
to save in Splunk
|
|
"""
|
|
logger.debug("Saving failure reports to Splunk")
|
|
if isinstance(failure_reports, dict):
|
|
failure_reports = [failure_reports]
|
|
|
|
if len(failure_reports) < 1:
|
|
return
|
|
|
|
json_lines: list[str] = []
|
|
for report in failure_reports:
|
|
data = self._common_data.copy()
|
|
data["sourcetype"] = "dmarc:failure"
|
|
# arrival_date_utc is a UTC wall-clock string; assume_utc keeps
|
|
# it from being re-interpreted as local time on non-UTC hosts.
|
|
timestamp = human_timestamp_to_unix_timestamp(
|
|
report["arrival_date_utc"], assume_utc=True
|
|
)
|
|
data["time"] = timestamp
|
|
data["event"] = report.copy()
|
|
json_lines.append(f"{json.dumps(data)}\n")
|
|
|
|
if not self.verify:
|
|
logger.debug("Skipping certificate verification for Splunk HEC")
|
|
try:
|
|
response = self.session.post(
|
|
self.url, content="".join(json_lines), timeout=self.timeout
|
|
)
|
|
response = response.json()
|
|
except Exception as e:
|
|
raise SplunkError(e.__str__())
|
|
if response["code"] != 0:
|
|
raise SplunkError(response["text"])
|
|
|
|
def save_smtp_tls_reports_to_splunk(
|
|
self, reports: list[dict[str, Any]] | dict[str, Any]
|
|
):
|
|
"""
|
|
Saves aggregate DMARC reports to Splunk
|
|
|
|
Args:
|
|
reports: A list of SMTP TLS report dictionaries
|
|
to save in Splunk
|
|
|
|
"""
|
|
logger.debug("Saving SMTP TLS reports to Splunk")
|
|
if isinstance(reports, dict):
|
|
reports = [reports]
|
|
|
|
if len(reports) < 1:
|
|
return
|
|
|
|
data = self._common_data.copy()
|
|
json_lines: list[str] = []
|
|
for report in reports:
|
|
data["sourcetype"] = "smtp:tls"
|
|
timestamp = human_timestamp_to_unix_timestamp(report["begin_date"])
|
|
data["time"] = timestamp
|
|
data["event"] = report.copy()
|
|
json_lines.append(f"{json.dumps(data)}\n")
|
|
|
|
if not self.verify:
|
|
logger.debug("Skipping certificate verification for Splunk HEC")
|
|
try:
|
|
response = self.session.post(
|
|
self.url, content="".join(json_lines), timeout=self.timeout
|
|
)
|
|
response = response.json()
|
|
except Exception as e:
|
|
raise SplunkError(e.__str__())
|
|
if response["code"] != 0:
|
|
raise SplunkError(response["text"])
|
|
|
|
def close(self):
|
|
"""Close the underlying HTTP session."""
|
|
self.session.close()
|
|
|
|
# Backward-compatible alias
|
|
save_forensic_reports_to_splunk = save_failure_reports_to_splunk
|