mirror of
https://github.com/domainaware/parsedmarc.git
synced 2026-05-22 11:55:24 +00:00
b7b8383fa4
* Expand honest test coverage from 59% to 83%; fix two latent bugs 271 new tests across the output modules, ES/OS clients, CLI config parsing, and the top-level parsing surface. Coverage measured against shipped code only (see [tool.coverage.run] source = ["parsedmarc"] omit = ["*/parsedmarc/resources/maps/*.py"] in pyproject.toml). Per-module results: s3.py 38% → 100% (also fixes SMTP-TLS-to-S3 bug below) gelf.py 40% → 100% syslog.py 46% → 100% kafkaclient.py 34% → 100% splunk.py 24% → 100% loganalytics.py 56% → 100% webhook.py 78% → 100% (also removes redundant try/except) elastic.py 36% → 99% opensearch.py 40% → 99% cli.py 52% → 69% __init__.py 74% → 76% (also fixes append_json bug below) utils.py 84% (unchanged in this PR) TOTAL 59% → 83% The remaining 17% is honest. The biggest unreached blocks are _main() in cli.py and the watch-mode mailbox iteration in __init__.py, both of which would require either standing up live subsystems (real Elasticsearch, real IMAP) or mocking deep enough that the test would verify the mock rather than the code. The PR-A AGENTS.md guidance — "if 90% requires faking it, ship 85% honestly" — applies here. Bugs fixed while writing tests: 1. parsedmarc/s3.py — SMTP-TLS-to-S3 was completely broken. save_report_to_s3 unconditionally read report["report_metadata"] when building S3 object metadata, but RFC 8460 §4.3 SMTP TLS reports are flat (no report_metadata sub-object). The CLI's surrounding try/except silently swallowed the KeyError, so every SMTP-TLS report quietly failed to upload. Also fixes a related issue: parse_smtp_tls_report_json stores begin_date as the raw ISO-8601 string from the report (per the SMTPTLSReport TypedDict and RFC 8460 §4.3), but the S3 code path assumed a datetime with .year / .month / .day attributes. Both fixed; the broken metadata-extraction branch now uses the flat-report fields, and the date branch normalizes via human_timestamp_to_datetime. 2. parsedmarc/__init__.py — append_json corrupted JSON output files on the second write. The original implementation opened files in "a+" mode, then seek()ed backwards to overwrite the trailing "]" with ",\n" before appending more elements. Python's docs are explicit (https://docs.python.org/3/library/functions.html#open): on POSIX, writes in "a"/"a+" mode always go to EOF regardless of seek() position. The result was that the second call produced [...]\n],\n[...] -style corrupted output instead of a single merged array. Replaced with a read-merge-write pattern: load the existing array (if any), append the new elements, rewrite the whole file. The CSV cousin append_csv was not affected — it doesn't seek backwards. 3. parsedmarc/webhook.py — removed redundant try/except blocks in save_aggregate_report_to_webhook / save_failure_report_to_webhook / save_smtp_tls_report_to_webhook. _send_to_webhook already catches every Exception itself, so the outer except blocks were unreachable dead code (covered nothing, defended against nothing, and inflated the source-line count without testing value). Testing approach: mocks at SDK boundaries (boto3 resource, kafka producer, requests session, opensearch/elasticsearch Document/Search, azure LogsIngestionClient). Tests verify the parsedmarc-side transformation logic — document/event construction, index/topic naming, dedup queries, error wrapping — rather than asserting on mock invocations as a proxy for behaviour. Where a branch is defensive against a caller that doesn't exist in the codebase, the test is omitted (commented in code rather than hidden behind a pragma). 547 tests total (was 276), all passing. ruff check + format clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Document the two bug fixes from this PR in the 10.0.0 changelog Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Document testing standards in AGENTS.md Adds a "Testing standards" section covering the principles applied in PR-A (split) and PR-B (coverage expansion): - Coverage measures shipped code only — don't reintroduce tests/* to the scope, don't expand omit, don't use # pragma: no cover. - Honest tests assert on observable behaviour, not "the mock was called". Mock at SDK boundaries; parse the payload that gets sent. - "If 90% requires faking it, ship 85% honestly" — coverage is a tool, not a goal. PR-B's deliberate stops at cli.py 69% and __init__.py 76% are the documented precedent for when to halt. - Verify bug claims against the relevant RFC, internal types, installed SDK source, or upstream docs before changing code. Cite the source in the commit message and test docstring (RFC 8460 §4.3 and the Python open() docs for #775's two bug fixes are the pattern to follow). - Bugs found while writing tests are fixed in the same PR; the test doubles as the regression guard. - File layout (tests/test_<module>.py) is non-negotiable; module-level test loggers need fresh-handler setup so test ordering doesn't break assertLogs. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Cover the corrupt-file fallback in append_json Codecov flagged 2 missing patch-coverage lines on PR #775: the except (json.JSONDecodeError, OSError) branch in append_json, which falls back to overwriting when the existing file isn't a parseable JSON array. Two new tests in tests/test_init.py:TestAppendJson exercise both paths: - test_corrupt_existing_file_is_overwritten_cleanly: existing file contains invalid JSON; append_json overwrites with the new array. - test_existing_file_with_non_list_root_is_overwritten: existing file parses as {"foo": ...} (dict, not list); the isinstance guard rejects it and we overwrite cleanly. Patch coverage now 100% on the bug fix. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
335 lines
12 KiB
Python
335 lines
12 KiB
Python
"""Tests for parsedmarc.gelf"""
|
|
|
|
import logging
|
|
import unittest
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from parsedmarc.gelf import ContextFilter, GelfClient, log_context_data
|
|
|
|
|
|
def _sample_aggregate_report():
|
|
"""Minimal aggregate report shape acceptable to
|
|
parsed_aggregate_reports_to_csv_rows."""
|
|
return {
|
|
"xml_schema": "draft",
|
|
"xml_namespace": None,
|
|
"report_metadata": {
|
|
"org_name": "example.com",
|
|
"org_email": "dmarc@example.com",
|
|
"org_extra_contact_info": None,
|
|
"report_id": "agg-1",
|
|
"begin_date": "2024-01-01 00:00:00",
|
|
"end_date": "2024-01-02 00:00:00",
|
|
"timespan_requires_normalization": False,
|
|
"original_timespan_seconds": 86400,
|
|
"errors": [],
|
|
"generator": None,
|
|
},
|
|
"policy_published": {
|
|
"domain": "example.com",
|
|
"adkim": "r",
|
|
"aspf": "r",
|
|
"p": "none",
|
|
"sp": "none",
|
|
"pct": None,
|
|
"fo": None,
|
|
"np": None,
|
|
"testing": None,
|
|
"discovery_method": None,
|
|
},
|
|
"records": [
|
|
{
|
|
"interval_begin": "2024-01-01 00:00:00",
|
|
"interval_end": "2024-01-02 00:00:00",
|
|
"normalized_timespan": False,
|
|
"source": {
|
|
"ip_address": "192.0.2.1",
|
|
"country": "US",
|
|
"reverse_dns": None,
|
|
"base_domain": None,
|
|
"name": None,
|
|
"type": None,
|
|
"asn": 64496,
|
|
"as_name": "Example AS",
|
|
"as_domain": "example.net",
|
|
},
|
|
"count": 7,
|
|
"alignment": {"spf": True, "dkim": True, "dmarc": True},
|
|
"policy_evaluated": {
|
|
"disposition": "none",
|
|
"dkim": "pass",
|
|
"spf": "pass",
|
|
"policy_override_reasons": [],
|
|
},
|
|
"identifiers": {
|
|
"header_from": "example.com",
|
|
"envelope_from": "example.com",
|
|
"envelope_to": None,
|
|
},
|
|
"auth_results": {
|
|
"dkim": [
|
|
{
|
|
"domain": "example.com",
|
|
"selector": "s1",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
}
|
|
],
|
|
"spf": [
|
|
{
|
|
"domain": "example.com",
|
|
"scope": "mfrom",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
}
|
|
],
|
|
},
|
|
}
|
|
],
|
|
}
|
|
|
|
|
|
class _Handler(logging.Handler):
|
|
"""Capture the (record, extra) of every log emit, so tests can
|
|
assert on what GelfClient actually pushed."""
|
|
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.records: list[tuple[str, dict]] = []
|
|
|
|
def emit(self, record):
|
|
# ContextFilter has run by this point so `record.parsedmarc` is
|
|
# whatever payload GelfClient set via log_context_data.
|
|
self.records.append((record.getMessage(), getattr(record, "parsedmarc", None)))
|
|
|
|
|
|
class TestGelfClientInit(unittest.TestCase):
|
|
"""GelfClient.__init__ wires a pygelf handler for the requested
|
|
transport. The mode lookup is a real failure surface: a typo in the
|
|
config (`udb` instead of `udp`) should KeyError loudly, not silently
|
|
pick the wrong transport."""
|
|
|
|
def test_init_udp_picks_udp_handler(self):
|
|
with (
|
|
patch("parsedmarc.gelf.GelfUdpHandler") as mock_udp,
|
|
patch("parsedmarc.gelf.GelfTcpHandler"),
|
|
patch("parsedmarc.gelf.GelfTlsHandler"),
|
|
):
|
|
GelfClient(host="graylog.example.com", port=12201, mode="udp")
|
|
mock_udp.assert_called_once_with(
|
|
host="graylog.example.com", port=12201, include_extra_fields=True
|
|
)
|
|
|
|
def test_init_tcp_picks_tcp_handler(self):
|
|
with (
|
|
patch("parsedmarc.gelf.GelfTcpHandler") as mock_tcp,
|
|
patch("parsedmarc.gelf.GelfUdpHandler"),
|
|
patch("parsedmarc.gelf.GelfTlsHandler"),
|
|
):
|
|
GelfClient(host="g", port=12201, mode="tcp")
|
|
mock_tcp.assert_called_once_with(
|
|
host="g", port=12201, include_extra_fields=True
|
|
)
|
|
|
|
def test_init_tls_picks_tls_handler(self):
|
|
with (
|
|
patch("parsedmarc.gelf.GelfTlsHandler") as mock_tls,
|
|
patch("parsedmarc.gelf.GelfUdpHandler"),
|
|
patch("parsedmarc.gelf.GelfTcpHandler"),
|
|
):
|
|
GelfClient(host="g", port=12201, mode="tls")
|
|
mock_tls.assert_called_once_with(
|
|
host="g", port=12201, include_extra_fields=True
|
|
)
|
|
|
|
def test_init_unknown_mode_raises_keyerror(self):
|
|
"""An unknown mode in config should be a loud failure, not silent."""
|
|
with (
|
|
patch("parsedmarc.gelf.GelfUdpHandler"),
|
|
patch("parsedmarc.gelf.GelfTcpHandler"),
|
|
patch("parsedmarc.gelf.GelfTlsHandler"),
|
|
):
|
|
with self.assertRaises(KeyError):
|
|
GelfClient(host="g", port=12201, mode="udb")
|
|
|
|
|
|
def _install_capturing_handler(client):
|
|
"""Replace the real pygelf handler with one that records emitted
|
|
log records and their `parsedmarc` payload. Returns the handler
|
|
so the test can inspect captured records."""
|
|
client.logger.removeHandler(client.handler)
|
|
h = _Handler()
|
|
client.logger.addHandler(h)
|
|
client.handler = h
|
|
return h
|
|
|
|
|
|
def _gelf_client():
|
|
# The parsedmarc_gelf logger is module-level — each new client adds
|
|
# another handler. Clear stale handlers from prior tests so the
|
|
# logger only carries this client's handler.
|
|
logging.getLogger("parsedmarc_gelf").handlers.clear()
|
|
with (
|
|
patch("parsedmarc.gelf.GelfUdpHandler"),
|
|
patch("parsedmarc.gelf.GelfTcpHandler"),
|
|
patch("parsedmarc.gelf.GelfTlsHandler"),
|
|
):
|
|
return GelfClient(host="g", port=12201, mode="udp")
|
|
|
|
|
|
class TestGelfClientSaveAggregate(unittest.TestCase):
|
|
"""save_aggregate_report_to_gelf emits one log record per
|
|
aggregate CSV row, with the row payload on `record.parsedmarc`.
|
|
Verifying the payload — not just "log was called" — catches future
|
|
regressions in the row-builder or filter wiring."""
|
|
|
|
def test_emits_one_record_per_csv_row_with_payload(self):
|
|
client = _gelf_client()
|
|
handler = _install_capturing_handler(client)
|
|
client.save_aggregate_report_to_gelf([_sample_aggregate_report()])
|
|
# One row in the sample report → one log record.
|
|
self.assertEqual(len(handler.records), 1)
|
|
message, payload = handler.records[0]
|
|
self.assertEqual(message, "parsedmarc aggregate report")
|
|
# The payload is the flattened CSV row; verify the key fields a
|
|
# Graylog dashboard would actually filter on.
|
|
self.assertEqual(payload["source_ip_address"], "192.0.2.1")
|
|
self.assertEqual(payload["header_from"], "example.com")
|
|
self.assertEqual(payload["count"], 7)
|
|
|
|
def test_clears_context_after_emit(self):
|
|
"""The thread-local payload is reset to None after the loop so
|
|
a later unrelated log call on the same thread doesn't carry
|
|
stale DMARC data."""
|
|
client = _gelf_client()
|
|
_install_capturing_handler(client)
|
|
client.save_aggregate_report_to_gelf([_sample_aggregate_report()])
|
|
self.assertIsNone(log_context_data.parsedmarc)
|
|
|
|
|
|
class TestGelfClientSaveFailure(unittest.TestCase):
|
|
"""save_failure_report_to_gelf operates on already-parsed failure
|
|
reports. Build one through the CSV-row helper to verify GelfClient
|
|
surfaces the right fields."""
|
|
|
|
def _sample_failure_report(self):
|
|
return {
|
|
"feedback_type": "auth-failure",
|
|
"user_agent": "test/1.0",
|
|
"version": "1",
|
|
"original_envelope_id": None,
|
|
"original_mail_from": "x@example.com",
|
|
"original_rcpt_to": None,
|
|
"arrival_date": "Thu, 1 Jan 2024 00:00:00 +0000",
|
|
"arrival_date_utc": "2024-01-01 00:00:00",
|
|
"authentication_results": None,
|
|
"delivery_result": "other",
|
|
"auth_failure": ["dmarc"],
|
|
"authentication_mechanisms": [],
|
|
"dkim_domain": None,
|
|
"reported_domain": "example.com",
|
|
"sample_headers_only": True,
|
|
"source": {
|
|
"ip_address": "192.0.2.5",
|
|
"country": "US",
|
|
"reverse_dns": None,
|
|
"base_domain": None,
|
|
"name": None,
|
|
"type": None,
|
|
"asn": 64496,
|
|
"as_name": "Example AS",
|
|
"as_domain": "example.net",
|
|
},
|
|
"sample": "...",
|
|
"parsed_sample": {"subject": "Test"},
|
|
}
|
|
|
|
def test_emits_one_record_per_failure_report(self):
|
|
client = _gelf_client()
|
|
handler = _install_capturing_handler(client)
|
|
client.save_failure_report_to_gelf([self._sample_failure_report()])
|
|
self.assertEqual(len(handler.records), 1)
|
|
message, payload = handler.records[0]
|
|
self.assertEqual(message, "parsedmarc failure report")
|
|
self.assertEqual(payload["source_ip_address"], "192.0.2.5")
|
|
self.assertEqual(payload["reported_domain"], "example.com")
|
|
|
|
|
|
class TestGelfClientSaveSmtpTls(unittest.TestCase):
|
|
def _sample_smtp_tls(self):
|
|
return {
|
|
"organization_name": "example.com",
|
|
"begin_date": "2024-02-03T00:00:00Z",
|
|
"end_date": "2024-02-04T00:00:00Z",
|
|
"contact_info": "tls@example.com",
|
|
"report_id": "tls-1",
|
|
"policies": [
|
|
{
|
|
"policy_domain": "example.com",
|
|
"policy_type": "sts",
|
|
"successful_session_count": 100,
|
|
"failed_session_count": 0,
|
|
}
|
|
],
|
|
}
|
|
|
|
def test_emits_one_record_per_policy(self):
|
|
client = _gelf_client()
|
|
handler = _install_capturing_handler(client)
|
|
client.save_smtp_tls_report_to_gelf([self._sample_smtp_tls()])
|
|
self.assertEqual(len(handler.records), 1)
|
|
message, payload = handler.records[0]
|
|
self.assertEqual(message, "parsedmarc smtptls report")
|
|
self.assertEqual(payload["policy_domain"], "example.com")
|
|
self.assertEqual(payload["successful_session_count"], 100)
|
|
|
|
|
|
class TestContextFilter(unittest.TestCase):
|
|
"""ContextFilter copies log_context_data.parsedmarc onto the log
|
|
record so pygelf can include it as an extra field. Failure mode:
|
|
if the filter raises (or removes itself), GELF output goes dark."""
|
|
|
|
def test_filter_copies_thread_local_onto_record(self):
|
|
log_context_data.parsedmarc = {"hello": "world"}
|
|
try:
|
|
f = ContextFilter()
|
|
record = logging.LogRecord(
|
|
name="x",
|
|
level=logging.INFO,
|
|
pathname=__file__,
|
|
lineno=1,
|
|
msg="msg",
|
|
args=(),
|
|
exc_info=None,
|
|
)
|
|
result = f.filter(record)
|
|
self.assertTrue(result)
|
|
self.assertEqual(record.parsedmarc, {"hello": "world"}) # type: ignore[attr-defined]
|
|
finally:
|
|
log_context_data.parsedmarc = None
|
|
|
|
|
|
class TestGelfClientClose(unittest.TestCase):
|
|
def test_close_removes_and_closes_handler(self):
|
|
client = _gelf_client()
|
|
handler = MagicMock()
|
|
client.logger.removeHandler(client.handler)
|
|
client.logger.addHandler(handler)
|
|
client.handler = handler
|
|
client.close()
|
|
handler.close.assert_called_once()
|
|
# Handler should no longer be attached after close().
|
|
self.assertNotIn(handler, client.logger.handlers)
|
|
|
|
|
|
class TestGelfClientBackwardCompatAlias(unittest.TestCase):
|
|
def test_forensic_alias_points_to_failure_method(self):
|
|
self.assertIs(
|
|
GelfClient.save_forensic_report_to_gelf, # type: ignore[attr-defined]
|
|
GelfClient.save_failure_report_to_gelf,
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(verbosity=2)
|