mirror of
https://github.com/domainaware/parsedmarc.git
synced 2026-11-10 19:11:00 +00:00
* Wrap the failure-report duplicate search in the output error The aggregate and SMTP TLS saves turn a failed duplicate-check search into ElasticsearchError or OpenSearchError; the failure-report saves let the search library's exception escape instead. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * Refuse date strings too long to be dates human_timestamp_to_datetime() had no length limit; a digit run of a million characters took 12 s in dateutil. Add a 128 character limit (ValueError) and map it to the matching Invalid*Report at the failure Arrival-Date, the message Date header and the failure-report sample Date in the Elasticsearch and OpenSearch saves. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * Skip failure sample headers with an empty name The Elasticsearch and OpenSearch failure saves normalise each header name; a name that is empty after that is not a valid field name, so leave the header out and save the rest. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * Add a persisted store of unfinished parse attempts A message whose parse kills the process (the out-of-memory killer, a container memory cap) is never moved out of the reports folder, so every later run parses it and dies again. parsedmarc.attempts keeps a small JSON file counting, per message, the parse attempts that started but never finished, so the mailbox loop can set such a message aside after MAX_PARSE_ATTEMPTS. The key hashes the first 64 KiB of the message because mailsuite's IMAP backend does not expose UIDVALIDITY, so a reused UID must not inherit an old count. Writes are atomic and owner only, and a failed write turns the store off instead of stopping a run. Refs GHSA-qcc2-4x3v-v4g7, GHSA-q7gm-8cj9-94hr, GHSA-4272-4r8g-6c5h Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Set aside mailbox messages that keep killing the parse A message whose parse ends the process stays in the reports folder, so every one-shot run or service restart parsed it again and died before reaching the reports behind it. The new [mailbox] attempts_file option records each message in an AttemptStore before it is parsed and clears the entry once the parse returns a report or raises ParserError, so an entry left behind marks a parse that never finished; a message with MAX_PARSE_ATTEMPTS of them is disposed of as invalid without parsing. The entry is cleared before the save, so a failed save is never counted as a crash, and only after a successful move, so a failed move is retried. With n_procs > 1 a dead run had a whole submission window in flight, so counting every message submitted beside the culprit would set innocent reports aside on the third run. A message with one unfinished attempt is therefore parsed alone in the calling process after the rest of the batch, and a second death counts against it only. PARSEDMARC_MAILBOX_ATTEMPTS_FILE names the file directly, so the key joins _DIRECT_FILE_KEYS; without it the variable was read as a Docker-secret reference. Refs GHSA-qcc2-4x3v-v4g7, GHSA-q7gm-8cj9-94hr, GHSA-4272-4r8g-6c5h Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Stop a parallel_map job that runs past a timeout The parse limits added for GHSA-qcc2-4x3v-v4g7 bound every input known to parse slowly, but nothing bounds a parse they do not cover: with n_procs = 1 the rest of the mailbox waits behind it. parallel_map() now takes parse_timeout and timeout_result. A job that runs that long gets timeout_result(job, parse_timeout) in its place; since a ProcessPoolExecutor cannot stop one job, every worker is killed, a new pool is started and the other unfinished jobs are resubmitted. A job's clock starts when its worker reports that it began, through a queue the pool initializer hands each worker. Future.running() is not enough: the executor marks one job more than it has workers as running, so a job queued behind a slow neighbour would be charged for the wait. ParseTimeoutError subclasses InvalidDMARCReport so the mbox and mailbox loops treat a timed-out message as invalid without changes. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Add parse_timeout to the mbox, mailbox and watch functions get_dmarc_reports_from_mbox(), get_dmarc_reports_from_mailbox() and watch_inbox() take parse_timeout and pass it to parallel_map() with the email job's timeout value. A timeout set with n_procs = 1 also takes the parallel_map() branch, since only a parse in a worker process can be stopped. The mailbox function and watch_inbox() reject an invalid value before fetching or watching, as they do for max_unsaved_retries: raised inside a watch check, the error would be retried on every check. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Add the [general] parse_timeout option The CLI reads parse_timeout as seconds, rejects a negative or non-numeric value as a ConfigurationError, defaults it to 0 (no limit), and passes it to the report-file, mbox, mailbox and watch calls. The watch call reads it from opts, so a SIGHUP reload takes a new value. The default stays 0 because the parse limits already bound the known inputs and a timeout routes every n_procs = 1 run through a worker process; the documentation suggests 300 seconds. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Document the attempts_file option Describe [mailbox] attempts_file in the option list and in a new usage section on messages that crash parsedmarc, say in the Unsaved note that the failed-save counts are the in-memory ones, keep the file in a state directory in the systemd example and in a named volume in the Docker Compose example, and add the Security changelog entry for the retry-loop backstop the three advisories deferred. Refs GHSA-qcc2-4x3v-v4g7, GHSA-q7gm-8cj9-94hr, GHSA-4272-4r8g-6c5h Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * List parse_timeout and attempts_file as orchestration options ParserConfig's docstring and the usage page's ParserConfig notes name the keyword arguments that stay outside the dataclass. The two new options are such arguments, so a library caller looking for them on ParserConfig is told where they go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Bound a suspect message's parse by parse_timeout With an attempts file, a message that was being parsed when an earlier run died is parsed alone after the rest of its batch, so that a second death is charged to it and not to the messages parsed beside it. That parse ran in the main process, where parse_timeout cannot stop it, so the one message most likely to be slow or fatal was the one the timeout did not cover. With a timeout set, each suspect now gets a worker pool of its own, one message per pool so a crash is still attributed to it alone, and its result is taken the same way as the batch's. Without a timeout the suspect is still parsed in this process. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Restore default signal handlers in parsing workers Under the fork start method a worker inherits the parent's signal handlers, and the CLI installs SIGTERM and SIGINT handlers that only set a flag. When a worker dies, ProcessPoolExecutor terminates the others with SIGTERM and joins them; a worker running the inherited handler ignores that signal, so the teardown waited forever and the run hung instead of failing. The pool initializer now resets both signals to their defaults. The logging tests that call the initializer in the test process put the process's own handlers back afterwards. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Order the Unreleased changelog and tie its entries together The three branches each added to the Unreleased entry. The GHSA-q7gm bullet still promised a follow-up for a persisted failed-attempt marker, which the attempts_file option now is, so it names the option. The attempts_file bullet now says that a suspect message is parsed in a worker of its own when parse_timeout is set, matching the code. The #942 fix moves up beside the other fix already on master, and the worker signal-handler fix gets its own line. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Ignore SIGINT in workers and end the batch when one dies Resetting SIGINT to its default in the workers made a Ctrl-C, which the terminal sends to the whole process group, kill every worker, so the run ended in BrokenProcessPool where the CLI's handler meant to let the batch finish. Workers now ignore SIGINT and keep the default SIGTERM action, which ProcessPoolExecutor needs to tear down a broken pool. A worker that dies for another reason (the out-of-memory killer, a crash) raised BrokenProcessPool out of parallel_map, which no caller handled: the file and mbox paths ended in a traceback. parallel_map now kills the remaining workers, closes the start queue and raises ParserError from it, and the CLI file and mbox paths log it and exit 1 as the mailbox paths already did. The in-flight messages keep their attempts-file entries, so the next run parses each alone. The systemd example gains KillMode=mixed so stopping the service signals only the main process and the batch in progress finishes. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * State the parse_timeout bounds the code actually gives A slow job running beside another that expires loses its partial run and starts again, so P slow jobs cost one more round of parse_timeout than the docstring said, plus the bounded joins of the killed workers, during which no heartbeat is sent. The clocks are also checked only while the parent waits for a result, so "at most one second past the timeout" was not true while the caller is busy between results; the docstring, usage.md and the changelog now say a parse is stopped within one wait slice of the parent next waiting. ParseTimeoutError's docstring says it is the value for every timed-out input, SMTP TLS and unrecognised ones included. A new test closes the results iterator mid-run and checks the workers are killed and the start queue closed; the zero-timeout test now observes which pool ran the job instead of patching _DeadlinePool. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Correct the attempts-file wording and test the parallel test mode Suspect isolation happens whenever the mailbox takes the parallel path, which parse_timeout selects even with n_procs = 1; the docstring, comment, usage.md and changelog now say so. The set-aside log said a message "has crashed parsedmarc {count-1} time(s)", which overstates the crashes once a failed move has added attempts; it now reports the unfinished attempts against the cap. usage.md lists attempts_file among the _file keys read directly from the environment and among the settings a SIGHUP reloads, and says that a failed write clearing an entry after a good parse can lead to a healthy message being set aside after two such failures. The test-mode set-aside test now runs the parallel path too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Measure a date's length after its comments are removed The length guard in human_timestamp_to_datetime() ran before the RFC 5322 comments were stripped. RFC 5322 section 3.2.2 puts no limit on a comment's length, so a valid Date header with a long comment was refused, and through the sample Date path the whole report email with it. The check now runs on the stripped value, which is linear to produce; a long digit run survives stripping, so it is still refused before dateutil sees it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Save parsed reports before exiting on a dead worker A ParserError from parallel_map (a worker process that died) or from an mbox made the CLI exit at once, discarding every report parsed so far; report files already moved under archive_directory were then saved nowhere. The CLI now stops reading input, saves what it gathered, and exits with status 1. Workers ignore SIGINT, so the plain pool path's executor shutdown on an early exit (KeyboardInterrupt, closing the generator) waited for the whole submission window. Any early exit now kills the workers, as the timed path already did. The Ctrl-C test ran under fork only, where a worker inherits the test's own harmless handler, so it passed without the SIGINT line. It now runs under every available start method and signals each worker once it has started a job. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Stop counting a message that is already set aside A message at the attempt limit that stayed in the folder (a failed move, test mode) was recorded again on every later run, so the logged count grew without bound. It is now set aside without being recorded, and the log names the stored count and the limit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Describe worker death per mode and the systemd stop window A dead worker ends a one-shot run with status 1 after saving, but in watch mode the IMAP and Maildir watchers log it and check again, while Graph and Gmail exit. KillMode=mixed lets the batch finish only within TimeoutStopSec. Also say that queued messages keep attempt entries too, and re-wrap a parse_timeout note line. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Clear the seen report IDs around the worker-death CLI tests The new save-before-exit test parses a sample in the parent, which records it in the shared dedup set, so a later test of the same sample saw it as a duplicate and sent no results email. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Save file reports when a mailbox fetch ends in a ParserError A worker that died during the one-shot mailbox fetch reached the ParserError handler, which exited before the reports from report files and mbox inputs were saved; files already moved under archive_directory were then kept nowhere. The handler now saves them first. A second test covers the input-error path: no mailbox is opened and the parsed file stays under archive_directory. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Say what a mailbox run keeps when a worker dies Earlier batches are saved and the batch in progress stays in the mailbox. Also say that a set-aside message is not recorded again, so its entry ages out after 30 days, and rewrap two paragraphs. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Say which set-aside entries age out of the attempts file The 30-day drop applies only to an entry that stays: a failed move, or a message left in place in test mode. The sentence read as if every set-aside message kept an entry, contradicting the line before it. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Carry the test attempts path in the message, not the environment test_parallel_path_records_each_attempt_before_submitting_it passed the attempts file's path to its worker job through os.environ. A forkserver worker forks from a server started before the patch, so it never saw the variable and the job raised KeyError (Python 3.14's Linux default). The path now travels in a header line of the message itself, which reaches the worker under every start method. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Test the worker-side helpers and the save-failure exits Codecov listed added lines no test reached: the timed pool's initializer and job wrapper, which run only in workers; _kill_workers on an executor without _processes; the plain path's heartbeat; the CLI's progress bar; the mbox loop's stop after a file worker dies; and a failed save before exiting, on the file/mbox path and the mailbox path. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Read start tokens every round, not only while waiting With parse_timeout set, the parent read the workers' start tokens only inside its wait loop. When results were already done at harvest time it never waited, so each finished job stayed in the pool's token map with its whole input, and the map grew with the run past the submission window. The tokens are now read at the top of every round, and close() clears the map. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Kill the parsing workers on a second Ctrl-C The second Ctrl-C ends parsedmarc with os._exit(130), which skips the process pool's cleanup. Workers now ignore SIGINT, so under every start method a running worker survived as an orphan and kept parsing, without end when parse_timeout is off. The handler now kills the active child processes first; Python runs it in the main thread between bytecodes, so active_children() and Process.kill() are safe there. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Hand timed results back through files, not the pool's pipe With parse_timeout set, a timeout kills every worker, possibly one that is sending a large result. The executor's management thread then waits for the rest of that message forever; the bounded join returns with the thread alive, and because it is not a daemon the interpreter hangs at exit. Reproduced under fork, forkserver and spawn with a 256-400 MiB result. Workers of the timed pool now pickle each outcome, error values included, to a file in a private directory the pool owns and return None; every message left on a pipe is far below PIPE_BUF, which POSIX writes atomically. The pool without a timeout never kills a running worker and is unchanged. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Report an unwritable temporary directory as a ParserError With parse_timeout set the results travel through a temporary directory. If it could not be created, or a worker could not write its result file, a raw OSError escaped parallel_map, which the CLI does not handle. The pool now raises ParserError naming the cause; a worker that cannot write its file returns the error text through the executor, still a small message, and the parent raises the same ParserError. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep every hand-back failure a short ParserError A result the worker could not pickle (PicklingError, TypeError, RecursionError, MemoryError) escaped through the executor with a traceback of any size, breaking the short-message guarantee the timed pool relies on, and a result file that did not unpickle raised a raw exception in the parent. The worker now catches any failure to write its outcome and returns a short marker, its text cut to 200 characters so the message stays below the 512-byte minimum PIPE_BUF; the parent turns it, and any failure to load a result file, into a ParserError. Also corrects the PIPE_BUF figure in the module docstring, names the temporary directory as TMPDIR, and avoids a second 128 MiB object in a test. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Cap the hand-back error text in bytes and survive a failing __str__ The pipe's atomic-write bound is in bytes, so a 200-character text of multibyte characters could exceed it; the cap now applies to the UTF-8 encoding. An exception whose __str__ raises is named by its type alone, so nothing in the worker's error path can raise through the executor. A failed write's .tmp file is removed with the pool's result directory; the docstring says so. Refs GHSA-qcc2-4x3v-v4g7 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Match the pickler's message across Python versions in a test The unpicklable-result test asserted "Can't get local object", which is the wording of Python 3.12 and 3.13 only; 3.10, 3.11 and 3.14 say "Can't pickle local object". Assert the part they share. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Cover the worker-side hand-back failures in the test process The three failure branches of _run_timed_job and _take_outcome run in worker processes in the pool tests, where coverage cannot see them; call them directly here with an unwritable directory, an unpicklable result and an unreadable result file. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Assert the unreadable-result message by its text, and format The temporary-directory error carries the OSError's text, not its class name, so the test asserts "Is a directory"; one long test line is wrapped as ruff format wants. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Narrow the marker before unpacking it in two tests pyright cannot narrow Optional through assertIsNotNone; a plain assert does. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
2589 lines
112 KiB
Python
2589 lines
112 KiB
Python
"""Tests for parsedmarc.elastic
|
|
|
|
Mocks at the elasticsearch.dsl SDK boundary (connections.create_connection,
|
|
Index, Search, Document.save, or a mock client registered as the
|
|
``default`` connection so the real Document.save runs) so the tests
|
|
verify the parsedmarc-side transformation logic — document
|
|
construction, index naming, deduplication queries, error wrapping —
|
|
without needing a running Elasticsearch cluster.
|
|
"""
|
|
|
|
import copy
|
|
import json
|
|
import re
|
|
import time
|
|
import unittest
|
|
from collections.abc import Iterator
|
|
from contextlib import contextmanager
|
|
from datetime import datetime, timedelta, timezone
|
|
from pathlib import Path
|
|
from typing import cast
|
|
from unittest.mock import MagicMock, call, patch
|
|
|
|
from elasticsearch import NotFoundError
|
|
|
|
import parsedmarc.elastic as elastic_module
|
|
from parsedmarc import (
|
|
InvalidFailureReport,
|
|
parse_aggregate_report_xml,
|
|
parse_report_email,
|
|
parse_report_file,
|
|
)
|
|
from parsedmarc.elastic import (
|
|
AlreadySaved,
|
|
ElasticsearchError,
|
|
create_data_streams,
|
|
create_indexes,
|
|
migrate_indexes,
|
|
save_aggregate_report_to_elasticsearch,
|
|
save_failure_report_to_elasticsearch,
|
|
save_smtp_tls_report_to_elasticsearch,
|
|
set_hosts,
|
|
)
|
|
from tests.tzutil import force_tz
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Sample report fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _aggregate_report(**overrides):
|
|
base = {
|
|
"xml_schema": "draft",
|
|
"xml_namespace": None,
|
|
"report_metadata": {
|
|
"org_name": "TestOrg",
|
|
"org_email": "dmarc@example.com",
|
|
"org_extra_contact_info": None,
|
|
"report_id": "agg-1",
|
|
"begin_date": "2024-01-15 00:00:00",
|
|
"end_date": "2024-01-16 00:00:00",
|
|
"timespan_requires_normalization": False,
|
|
"original_timespan_seconds": 86400,
|
|
"errors": [],
|
|
"generator": "TestGen/1.0",
|
|
},
|
|
"policy_published": {
|
|
"domain": "example.com",
|
|
"adkim": "r",
|
|
"aspf": "r",
|
|
"p": "none",
|
|
"sp": "none",
|
|
"pct": None,
|
|
"fo": None,
|
|
"np": "reject",
|
|
"testing": "n",
|
|
"discovery_method": "treewalk",
|
|
},
|
|
"records": [
|
|
{
|
|
"interval_begin": "2024-01-15 00:00:00",
|
|
"interval_end": "2024-01-16 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": 4,
|
|
"alignment": {"spf": True, "dkim": True, "dmarc": True},
|
|
"policy_evaluated": {
|
|
"disposition": "none",
|
|
"dkim": "pass",
|
|
"spf": "pass",
|
|
"policy_override_reasons": [
|
|
{"type": "local_policy", "comment": "approved"}
|
|
],
|
|
},
|
|
"identifiers": {
|
|
"header_from": "example.com",
|
|
"envelope_from": "example.com",
|
|
"envelope_to": "rcpt@example.com",
|
|
},
|
|
"auth_results": {
|
|
"dkim": [
|
|
{
|
|
"domain": "example.com",
|
|
"selector": "s",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
}
|
|
],
|
|
"spf": [
|
|
{
|
|
"domain": "example.com",
|
|
"scope": "mfrom",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
}
|
|
],
|
|
},
|
|
}
|
|
],
|
|
}
|
|
base.update(overrides)
|
|
return base
|
|
|
|
|
|
def _failure_report(**overrides):
|
|
base = {
|
|
"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": "raw",
|
|
"parsed_sample": {
|
|
"headers": {
|
|
# mailparser emits headers as [[display_name, address]]
|
|
# lists; an empty display becomes [["", address]].
|
|
"From": [["Sender Name", "sender@example.com"]],
|
|
"To": [["", "rcpt@example.com"]],
|
|
"Subject": "Test",
|
|
},
|
|
"subject": "Test",
|
|
"filename_safe_subject": "Test",
|
|
"body": "body",
|
|
"date": "Thu, 1 Jan 2024 00:00:00 +0000",
|
|
"to": [{"display_name": None, "address": "rcpt@example.com"}],
|
|
"reply_to": [],
|
|
"cc": [],
|
|
"bcc": [],
|
|
"attachments": [],
|
|
},
|
|
}
|
|
base.update(overrides)
|
|
return base
|
|
|
|
|
|
def _smtp_tls_report(**overrides):
|
|
base = {
|
|
"organization_name": "TestOrg",
|
|
"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": 1,
|
|
"policy_strings": ["version: STSv1"],
|
|
"mx_host_patterns": ["*.example.com"],
|
|
"failure_details": [
|
|
{
|
|
"result_type": "certificate-expired",
|
|
"failed_session_count": 1,
|
|
"receiving_mx_hostname": "mx.example.com",
|
|
"sending_mta_ip": "10.0.0.1",
|
|
}
|
|
],
|
|
}
|
|
],
|
|
}
|
|
base.update(overrides)
|
|
return base
|
|
|
|
|
|
def _empty_search():
|
|
"""A Search() mock whose .execute() returns an empty hit list."""
|
|
search = MagicMock()
|
|
search.execute.return_value = []
|
|
return search
|
|
|
|
|
|
def _populated_search():
|
|
"""A Search() mock whose .execute() returns a non-empty hit list."""
|
|
search = MagicMock()
|
|
search.execute.return_value = [MagicMock()]
|
|
return search
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# set_hosts: connection-parameter assembly
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSetHosts(unittest.TestCase):
|
|
"""Verify the conn_params dict handed to the elasticsearch-py 8.x client
|
|
matches each documented option. Each branch corresponds to a
|
|
real-world deployment shape (TLS, basic auth, API key, custom CA).
|
|
|
|
The 8.x client dropped the ``use_ssl`` / ``http_auth`` / ``timeout``
|
|
connection kwargs: the scheme now has to be baked into each host URL,
|
|
``basic_auth`` replaces ``http_auth``, and ``request_timeout`` replaces
|
|
``timeout``.
|
|
"""
|
|
|
|
def test_single_host_url_passed_through_unchanged(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("https://es:9200")
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["hosts"], ["https://es:9200"])
|
|
|
|
def test_host_list_preserved(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts(["http://es1:9200", "http://es2:9200"])
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["hosts"], ["http://es1:9200", "http://es2:9200"])
|
|
|
|
def test_bare_host_use_ssl_false_gets_http_prefix(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("localhost", use_ssl=False)
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["hosts"], ["http://localhost"])
|
|
self.assertNotIn("use_ssl", kwargs)
|
|
|
|
def test_bare_host_use_ssl_true_gets_https_prefix(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("localhost", use_ssl=True)
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["hosts"], ["https://localhost"])
|
|
self.assertEqual(kwargs["verify_certs"], True)
|
|
self.assertNotIn("use_ssl", kwargs)
|
|
self.assertNotIn("ca_certs", kwargs)
|
|
|
|
def test_explicit_url_passes_through_even_with_use_ssl_true(self):
|
|
"""A host that already carries a scheme is never re-prefixed,
|
|
even when it disagrees with use_ssl."""
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("http://example.com:9200", use_ssl=True)
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["hosts"], ["http://example.com:9200"])
|
|
|
|
def test_timeout_default_60s_becomes_request_timeout(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200")
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["request_timeout"], 60.0)
|
|
self.assertNotIn("timeout", kwargs)
|
|
|
|
def test_timeout_custom(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", timeout=30.0)
|
|
self.assertEqual(mock_conn.call_args.kwargs["request_timeout"], 30.0)
|
|
|
|
def test_use_ssl_with_custom_ca(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", use_ssl=True, ssl_cert_path="/etc/ca.pem")
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["ca_certs"], "/etc/ca.pem")
|
|
|
|
def test_skip_certificate_verification_sets_verify_false(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", use_ssl=True, skip_certificate_verification=True)
|
|
self.assertEqual(mock_conn.call_args.kwargs["verify_certs"], False)
|
|
|
|
def test_username_password_sets_basic_auth(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", username="u", password="p")
|
|
kwargs = mock_conn.call_args.kwargs
|
|
self.assertEqual(kwargs["basic_auth"], ("u", "p"))
|
|
self.assertNotIn("http_auth", kwargs)
|
|
|
|
def test_username_without_password_not_set(self):
|
|
"""Half-configured auth is suspicious enough not to send."""
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", username="u")
|
|
self.assertNotIn("basic_auth", mock_conn.call_args.kwargs)
|
|
|
|
def test_api_key_set(self):
|
|
with patch("parsedmarc.elastic.connections.create_connection") as mock_conn:
|
|
set_hosts("es:9200", api_key="base64key==")
|
|
self.assertEqual(mock_conn.call_args.kwargs["api_key"], "base64key==")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# create_indexes
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestCreateIndexes(unittest.TestCase):
|
|
def test_creates_missing_index_with_default_settings(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_indexes(["dmarc_aggregate-2024-01-15"])
|
|
mock_get_conn.return_value.indices.create.assert_called_once_with(
|
|
index="dmarc_aggregate-2024-01-15",
|
|
body={"settings": {"number_of_shards": 1, "number_of_replicas": 0}},
|
|
)
|
|
|
|
def test_creates_with_custom_settings(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_indexes(
|
|
["idx"], settings={"number_of_shards": 3, "refresh_interval": "5s"}
|
|
)
|
|
body = mock_get_conn.return_value.indices.create.call_args.kwargs["body"]
|
|
self.assertEqual(
|
|
body, {"settings": {"number_of_shards": 3, "refresh_interval": "5s"}}
|
|
)
|
|
|
|
def test_skips_existing_index(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
create_indexes(["idx"], mappings={"date_detection": False})
|
|
mock_get_conn.return_value.indices.create.assert_not_called()
|
|
mock_get_conn.return_value.indices.put_mapping.assert_not_called()
|
|
|
|
def test_wraps_sdk_error(self):
|
|
with patch("parsedmarc.elastic.Index") as mock_index_cls:
|
|
mock_index_cls.return_value.exists.side_effect = RuntimeError(
|
|
"cluster down"
|
|
)
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
create_indexes(["idx"])
|
|
self.assertIn("cluster down", str(ctx.exception))
|
|
|
|
|
|
class TestCreateIndexesServerless(unittest.TestCase):
|
|
"""Serverless mode strips shard/replica keys but keeps everything else.
|
|
|
|
Elastic Cloud Serverless rejects ``number_of_shards`` and
|
|
``number_of_replicas`` with HTTP 400. Other settings like
|
|
``refresh_interval`` are accepted and must pass through unchanged.
|
|
"""
|
|
|
|
def setUp(self):
|
|
self._original = elastic_module._SERVERLESS
|
|
elastic_module._SERVERLESS = True
|
|
|
|
def tearDown(self):
|
|
elastic_module._SERVERLESS = self._original
|
|
|
|
def _created_body(self, **kwargs):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_indexes(["idx"], **kwargs)
|
|
create = mock_get_conn.return_value.indices.create
|
|
create.assert_called_once()
|
|
return create.call_args.kwargs["body"]
|
|
|
|
def test_serverless_default_skips_settings_entirely(self):
|
|
self.assertEqual(self._created_body(), {})
|
|
|
|
def test_serverless_filters_rejected_keys_and_passes_others_through(self):
|
|
body = self._created_body(
|
|
settings={
|
|
"number_of_shards": 3,
|
|
"number_of_replicas": 2,
|
|
"refresh_interval": "5s",
|
|
},
|
|
)
|
|
self.assertEqual(body, {"settings": {"refresh_interval": "5s"}})
|
|
|
|
def test_serverless_skips_settings_when_only_rejected_keys(self):
|
|
body = self._created_body(
|
|
settings={"number_of_shards": 3, "number_of_replicas": 2},
|
|
mappings={"date_detection": False},
|
|
)
|
|
self.assertEqual(body, {"mappings": {"date_detection": False}})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# migrate_indexes
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestMigrateIndexes(unittest.TestCase):
|
|
"""migrate_indexes backfills dkim_results_combined/spf_results_combined
|
|
(issue #169) on pre-existing aggregate documents as a non-blocking
|
|
background task. It is guarded by a cheap count() query so repeated
|
|
startups against an already-backfilled index are a no-op, and any SDK
|
|
error is caught and logged rather than raised, so it never blocks
|
|
parsedmarc startup."""
|
|
|
|
def test_backfill_submitted_when_old_docs_exist(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.return_value = {"count": 42}
|
|
mock_get_conn.return_value = mock_client
|
|
migrate_indexes(aggregate_indexes=["dmarc_aggregate"])
|
|
|
|
mock_client.update_by_query.assert_called_once()
|
|
kwargs = mock_client.update_by_query.call_args.kwargs
|
|
self.assertEqual(kwargs["index"], "dmarc_aggregate*")
|
|
self.assertEqual(kwargs["conflicts"], "proceed")
|
|
self.assertFalse(kwargs["wait_for_completion"])
|
|
self.assertEqual(kwargs["query"], elastic_module._COMBINED_BACKFILL_QUERY)
|
|
script_source = kwargs["script"]["source"]
|
|
self.assertIn("ctx._source.dkim_results_combined", script_source)
|
|
self.assertIn("ctx._source.spf_results_combined", script_source)
|
|
|
|
# The count() guard query also targets the date-suffixed pattern.
|
|
count_kwargs = mock_client.count.call_args.kwargs
|
|
self.assertEqual(count_kwargs["index"], "dmarc_aggregate*")
|
|
self.assertEqual(count_kwargs["query"], elastic_module._COMBINED_BACKFILL_QUERY)
|
|
|
|
def test_backfill_skipped_when_no_old_docs(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.return_value = {"count": 0}
|
|
mock_get_conn.return_value = mock_client
|
|
migrate_indexes(aggregate_indexes=["dmarc_aggregate"])
|
|
|
|
mock_client.update_by_query.assert_not_called()
|
|
|
|
def test_backfill_skipped_when_no_aggregate_indexes(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
migrate_indexes()
|
|
migrate_indexes(aggregate_indexes=None)
|
|
|
|
mock_get_conn.assert_not_called()
|
|
|
|
def test_backfill_failure_does_not_raise(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.side_effect = RuntimeError("cluster unreachable")
|
|
mock_get_conn.return_value = mock_client
|
|
with self.assertLogs("parsedmarc.log", level="WARNING") as cm:
|
|
migrate_indexes(aggregate_indexes=["dmarc_aggregate"])
|
|
|
|
self.assertTrue(any("cluster unreachable" in msg for msg in cm.output))
|
|
mock_client.update_by_query.assert_not_called()
|
|
|
|
def test_get_connection_failure_does_not_raise(self):
|
|
"""connections.get_connection() itself sits outside the per-index
|
|
try/except; if it raises (e.g. no Elasticsearch connection has been
|
|
configured yet), migrate_indexes must still not propagate the
|
|
exception, per its docstring's promise that any cluster error is
|
|
caught and logged."""
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_get_conn.side_effect = RuntimeError("no connection")
|
|
with self.assertLogs("parsedmarc.log", level="WARNING") as cm:
|
|
migrate_indexes(aggregate_indexes=["dmarc_aggregate"])
|
|
|
|
self.assertTrue(
|
|
any("Skipping the dkim_results_combined" in msg for msg in cm.output)
|
|
)
|
|
self.assertTrue(any("no connection" in msg for msg in cm.output))
|
|
|
|
def test_smtp_tls_backfill_submitted_when_old_docs_exist(self):
|
|
"""SMTP TLS analogue of test_backfill_submitted_when_old_docs_exist:
|
|
policies_combined/failure_details_combined backfill (also issue
|
|
#169) is submitted with its own guard query and painless script."""
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.return_value = {"count": 7}
|
|
mock_get_conn.return_value = mock_client
|
|
migrate_indexes(smtp_tls_indexes=["smtp_tls"])
|
|
|
|
mock_client.update_by_query.assert_called_once()
|
|
kwargs = mock_client.update_by_query.call_args.kwargs
|
|
self.assertEqual(kwargs["index"], "smtp_tls*")
|
|
self.assertEqual(kwargs["conflicts"], "proceed")
|
|
self.assertFalse(kwargs["wait_for_completion"])
|
|
self.assertEqual(
|
|
kwargs["query"], elastic_module._SMTP_TLS_COMBINED_BACKFILL_QUERY
|
|
)
|
|
script_source = kwargs["script"]["source"]
|
|
self.assertIn("ctx._source.policies_combined", script_source)
|
|
self.assertIn("ctx._source.failure_details_combined", script_source)
|
|
|
|
count_kwargs = mock_client.count.call_args.kwargs
|
|
self.assertEqual(count_kwargs["index"], "smtp_tls*")
|
|
self.assertEqual(
|
|
count_kwargs["query"], elastic_module._SMTP_TLS_COMBINED_BACKFILL_QUERY
|
|
)
|
|
|
|
def test_smtp_tls_backfill_skipped_when_no_old_docs(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.return_value = {"count": 0}
|
|
mock_get_conn.return_value = mock_client
|
|
migrate_indexes(smtp_tls_indexes=["smtp_tls"])
|
|
|
|
mock_client.update_by_query.assert_not_called()
|
|
|
|
def test_smtp_tls_backfill_skipped_when_no_smtp_tls_indexes_or_aggregate(self):
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
migrate_indexes()
|
|
migrate_indexes(smtp_tls_indexes=None)
|
|
|
|
mock_get_conn.assert_not_called()
|
|
|
|
def test_smtp_tls_backfill_failure_does_not_raise(self):
|
|
"""SMTP TLS analogue of test_backfill_failure_does_not_raise: an
|
|
error from the cluster during the smtp_tls_indexes loop is caught
|
|
and logged rather than raised."""
|
|
with patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn:
|
|
mock_client = MagicMock()
|
|
mock_client.count.side_effect = RuntimeError("cluster unreachable")
|
|
mock_get_conn.return_value = mock_client
|
|
with self.assertLogs("parsedmarc.log", level="WARNING") as cm:
|
|
migrate_indexes(smtp_tls_indexes=["smtp_tls"])
|
|
|
|
self.assertTrue(any("cluster unreachable" in msg for msg in cm.output))
|
|
mock_client.update_by_query.assert_not_called()
|
|
|
|
|
|
def _typeless_fo_mapping(index_name, fo_type):
|
|
"""An indices.get_field_mapping response in the modern, typeless shape.
|
|
|
|
Elasticsearch 8 has no mapping types, so the field sits directly under
|
|
``mappings``. This is the only shape a supported cluster returns; the
|
|
ES 6-era type-keyed shape is covered separately.
|
|
"""
|
|
return {
|
|
index_name: {
|
|
"mappings": {
|
|
"published_policy.fo": {
|
|
"full_name": "published_policy.fo",
|
|
"mapping": {"fo": {"type": fo_type}},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
class TestMigrateIndexesFoMigration(unittest.TestCase):
|
|
"""parsedmarc releases before 5.0.0 declared published_policy.fo as an
|
|
integer, so their indexes mapped it as `long`, which cannot hold the
|
|
multi-value `fo` settings reports carry (`0:1`, `d:s`). migrate_indexes
|
|
detects that and rebuilds the index with the text/keyword shape.
|
|
|
|
Elasticsearch 8 refuses to open an index created before 7.0, so an
|
|
affected index reaches a supported cluster only by being carried
|
|
forward through a reindex — which keeps the old mapping whenever the
|
|
destination is pre-created from it, as the standard reindex procedure
|
|
does. Each test stubs the combined-field backfill that runs afterwards
|
|
in the same call (count 0 → no-op)."""
|
|
|
|
@staticmethod
|
|
def _noop_backfill_client():
|
|
client = MagicMock()
|
|
client.count.return_value = {"count": 0}
|
|
return client
|
|
|
|
@staticmethod
|
|
def _index_mocks(*, v2_exists):
|
|
"""Distinct Index() mocks per name, so the original and the -v2
|
|
target can be told apart. A single shared mock cannot express
|
|
"the original exists but its migration target does not", which is
|
|
the ordinary case."""
|
|
original = MagicMock(name="dmarc_aggregate")
|
|
original.exists.return_value = True
|
|
original.get_field_mapping.return_value = _typeless_fo_mapping(
|
|
"dmarc_aggregate", "long"
|
|
)
|
|
v2 = MagicMock(name="dmarc_aggregate-v2")
|
|
v2.exists.return_value = v2_exists
|
|
return original, v2, lambda name: v2 if name.endswith("-v2") else original
|
|
|
|
def test_skips_non_existent_index(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_get_conn.return_value = self._noop_backfill_client()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
migrate_indexes(legacy_fo_indexes=["missing"])
|
|
mock_index_cls.return_value.get_field_mapping.assert_not_called()
|
|
|
|
def test_skips_when_field_is_unmapped(self):
|
|
"""An index that does not map published_policy.fo at all (e.g. an
|
|
empty index with the default mapping) is left alone."""
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
):
|
|
mock_get_conn.return_value = self._noop_backfill_client()
|
|
idx = mock_index_cls.return_value
|
|
idx.exists.return_value = True
|
|
idx.get_field_mapping.return_value = {"dmarc_aggregate": {"mappings": {}}}
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
mock_reindex.assert_not_called()
|
|
idx.create.assert_not_called()
|
|
idx.delete.assert_not_called()
|
|
|
|
def test_migrates_when_fo_is_long(self):
|
|
"""The actual migration path: when fo is mapped as 'long', a v2
|
|
index is created with the corrected text/keyword mapping, data is
|
|
reindexed into it, and the old index is deleted."""
|
|
original, v2, factory = self._index_mocks(v2_exists=False)
|
|
with (
|
|
patch("parsedmarc.elastic.Index", side_effect=factory) as mock_index_cls,
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_client = self._noop_backfill_client()
|
|
mock_get_conn.return_value = mock_client
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
|
|
self.assertIn(call("dmarc_aggregate-v2"), mock_index_cls.call_args_list)
|
|
v2.create.assert_called_once_with()
|
|
mapping_kwargs = v2.put_mapping.call_args.kwargs
|
|
self.assertNotIn("body", mapping_kwargs)
|
|
self.assertEqual(
|
|
mapping_kwargs["properties"]["published_policy"]["properties"]["fo"],
|
|
{
|
|
"type": "text",
|
|
"fields": {"keyword": {"type": "keyword", "ignore_above": 256}},
|
|
},
|
|
)
|
|
|
|
# reindex old -> new (v2) with the connection's client, and only
|
|
# then is the original dropped. The v2 index is never deleted here:
|
|
# nothing was left over to discard.
|
|
mock_reindex.assert_called_once_with(
|
|
mock_client, "dmarc_aggregate", "dmarc_aggregate-v2"
|
|
)
|
|
original.delete.assert_called_once_with()
|
|
v2.delete.assert_not_called()
|
|
|
|
def test_retries_after_an_interrupted_earlier_attempt(self):
|
|
"""A run that died between create() and delete() leaves a -v2 index
|
|
behind. Reaching this code means the original still holds the data
|
|
-- it is deleted only after the reindex succeeds -- so the leftover
|
|
is debris. Without discarding it, create() raises "resource already
|
|
exists" on every later startup and the index is never migrated;
|
|
confirmed against a live cluster, where the unfixed code left the
|
|
original in place and the debris document in the v2 index."""
|
|
original, v2, factory = self._index_mocks(v2_exists=True)
|
|
with (
|
|
patch("parsedmarc.elastic.Index", side_effect=factory),
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_client = self._noop_backfill_client()
|
|
mock_get_conn.return_value = mock_client
|
|
with self.assertLogs("parsedmarc.log", level="WARNING") as cm:
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
|
|
self.assertTrue(
|
|
any("Discarding dmarc_aggregate-v2" in msg for msg in cm.output)
|
|
)
|
|
# The stale target is dropped, then recreated, and the migration
|
|
# runs to completion instead of aborting on "already exists".
|
|
v2.delete.assert_called_once_with()
|
|
v2.create.assert_called_once_with()
|
|
mock_reindex.assert_called_once_with(
|
|
mock_client, "dmarc_aggregate", "dmarc_aggregate-v2"
|
|
)
|
|
original.delete.assert_called_once_with()
|
|
|
|
def test_migrates_when_fo_is_long_under_a_mapping_type(self):
|
|
"""The Elasticsearch 6-era response nested the field under the
|
|
mapping type name. No cluster either client can connect to still
|
|
reports mappings that way, so this covers the fallback branch
|
|
rather than a reachable deployment -- but the branch is what lets
|
|
the type check stay a check on the mapped type instead of on the
|
|
response shape, which is what broke this migration before."""
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_get_conn.return_value = self._noop_backfill_client()
|
|
idx = mock_index_cls.return_value
|
|
idx.exists.return_value = True
|
|
idx.get_field_mapping.return_value = {
|
|
"dmarc_aggregate": {
|
|
"mappings": {
|
|
"doc": {
|
|
"published_policy.fo": {"mapping": {"fo": {"type": "long"}}}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
mock_reindex.assert_called_once()
|
|
|
|
def test_skips_when_fo_already_text(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
):
|
|
mock_get_conn.return_value = self._noop_backfill_client()
|
|
idx = mock_index_cls.return_value
|
|
idx.exists.return_value = True
|
|
idx.get_field_mapping.return_value = _typeless_fo_mapping(
|
|
"dmarc_aggregate", "text"
|
|
)
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
mock_reindex.assert_not_called()
|
|
idx.create.assert_not_called()
|
|
idx.delete.assert_not_called()
|
|
|
|
def test_index_exists_failure_does_not_raise(self):
|
|
"""A cluster error inside the per-index fo-migration loop (e.g.
|
|
Index(...).exists() raising because the cluster is unreachable)
|
|
must not abort startup: it is caught, logged, and the loop moves
|
|
on to the combined-field backfill, which is exercised here with
|
|
its own connection failure so both warnings are asserted."""
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_index_cls.return_value.exists.side_effect = ConnectionError(
|
|
"cluster unreachable"
|
|
)
|
|
mock_get_conn.side_effect = RuntimeError("no connection")
|
|
with self.assertLogs("parsedmarc.log", level="WARNING") as cm:
|
|
migrate_indexes(
|
|
aggregate_indexes=["dmarc_aggregate"],
|
|
legacy_fo_indexes=["dmarc_aggregate"],
|
|
)
|
|
|
|
self.assertTrue(
|
|
any(
|
|
"legacy published_policy.fo migration" in msg
|
|
and "cluster unreachable" in msg
|
|
for msg in cm.output
|
|
)
|
|
)
|
|
self.assertTrue(
|
|
any("Skipping the dkim_results_combined" in msg for msg in cm.output)
|
|
)
|
|
self.assertTrue(any("no connection" in msg for msg in cm.output))
|
|
|
|
def test_no_legacy_indexes_means_no_lookup(self):
|
|
"""The combined-field backfill must not drag the fo migration
|
|
along: passing only aggregate_indexes leaves the legacy loop
|
|
untouched, so a modern deployment never probes for it."""
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
):
|
|
mock_get_conn.return_value = self._noop_backfill_client()
|
|
migrate_indexes(aggregate_indexes=["dmarc_aggregate"])
|
|
mock_index_cls.return_value.exists.assert_not_called()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# save_aggregate_report_to_elasticsearch
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSaveAggregateReport(unittest.TestCase):
|
|
"""The aggregate-report save fans out across multiple SDK calls:
|
|
Search (for dedup), Index.create (for the daily/monthly index),
|
|
Document.save. Each test patches the boundary it needs and
|
|
leaves the rest alone."""
|
|
|
|
def _patches(self, search_factory=_empty_search):
|
|
return [
|
|
patch("parsedmarc.elastic.Search", return_value=search_factory()),
|
|
patch(
|
|
"parsedmarc.elastic.Index",
|
|
return_value=MagicMock(exists=MagicMock(return_value=True)),
|
|
),
|
|
patch.object(elastic_module._AggregateReportDoc, "save"),
|
|
]
|
|
|
|
def test_save_emits_one_document_per_record(self):
|
|
report = _aggregate_report()
|
|
report["records"].append(report["records"][0].copy())
|
|
patches = self._patches()
|
|
with patches[0], patches[1], patches[2] as mock_save:
|
|
save_aggregate_report_to_elasticsearch(report)
|
|
# Two records → two saves.
|
|
self.assertEqual(mock_save.call_count, 2)
|
|
|
|
def test_already_saved_raises_when_search_returns_hit(self):
|
|
"""The dedup query is the only thing preventing
|
|
double-indexing on re-run. A regression would silently
|
|
re-save reports, inflating Kibana counts."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_populated_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._AggregateReportDoc, "save") as mock_save,
|
|
):
|
|
with self.assertRaises(AlreadySaved):
|
|
save_aggregate_report_to_elasticsearch(_aggregate_report())
|
|
mock_save.assert_not_called()
|
|
|
|
def test_search_exception_wraps_to_elasticsearch_error(self):
|
|
bad_search = MagicMock()
|
|
bad_search.execute.side_effect = RuntimeError("network")
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=bad_search),
|
|
patch("parsedmarc.elastic.Index"),
|
|
):
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
save_aggregate_report_to_elasticsearch(_aggregate_report())
|
|
self.assertIn("network", str(ctx.exception))
|
|
|
|
def test_save_exception_wraps_to_elasticsearch_error(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._AggregateReportDoc,
|
|
"save",
|
|
side_effect=RuntimeError("disk"),
|
|
),
|
|
):
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
save_aggregate_report_to_elasticsearch(_aggregate_report())
|
|
self.assertIn("disk", str(ctx.exception))
|
|
|
|
def test_index_name_uses_daily_format_by_default(self):
|
|
"""Index naming: dmarc_aggregate-YYYY-MM-DD by default."""
|
|
index_calls = []
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._AggregateReportDoc, "save"),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
save_aggregate_report_to_elasticsearch(_aggregate_report())
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("dmarc_aggregate-2024-01-15", index_calls)
|
|
|
|
def test_index_name_uses_monthly_format_when_flag_set(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._AggregateReportDoc, "save"),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
save_aggregate_report_to_elasticsearch(
|
|
_aggregate_report(), monthly_indexes=True
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("dmarc_aggregate-2024-01", index_calls)
|
|
|
|
def test_index_name_honours_suffix_and_prefix(self):
|
|
"""Prefix/suffix support multi-tenant setups where one ES
|
|
cluster serves several DMARC owners."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._AggregateReportDoc, "save"),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
save_aggregate_report_to_elasticsearch(
|
|
_aggregate_report(),
|
|
index_suffix="tenant_a",
|
|
index_prefix="customer1_",
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("customer1_dmarc_aggregate_tenant_a-2024-01-15", index_calls)
|
|
|
|
def test_dedup_search_pattern_uses_suffix_wildcard(self):
|
|
"""Existing-report search uses '*' so it matches both
|
|
daily and monthly index buckets."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch(
|
|
"parsedmarc.elastic.Index",
|
|
return_value=MagicMock(exists=MagicMock(return_value=True)),
|
|
),
|
|
patch.object(elastic_module._AggregateReportDoc, "save"),
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
save_aggregate_report_to_elasticsearch(
|
|
_aggregate_report(), index_suffix="tenant_a", index_prefix="cust_"
|
|
)
|
|
# Search index pattern wraps prefix+name+suffix with trailing wildcard.
|
|
search_index = mock_search_cls.call_args.kwargs["index"]
|
|
self.assertIn("cust_dmarc_aggregate_tenant_a*", search_index)
|
|
|
|
@unittest.skipUnless(hasattr(time, "tzset"), "requires POSIX time.tzset()")
|
|
def test_interval_dates_are_utc_regardless_of_host_timezone(self):
|
|
"""interval_begin/interval_end are UTC wall-clock strings (already
|
|
converted to UTC at parse time in __init__.py); the index-date
|
|
bucketing and stored date_begin/date_end must use their true UTC
|
|
epoch on any host. Regression test for
|
|
https://github.com/domainaware/parsedmarc/issues/819: the naive
|
|
parse used to shift the stored epoch (and therefore the index
|
|
date) by the host's UTC offset."""
|
|
force_tz(self)
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic._AggregateReportDoc") as mock_doc_cls,
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
save_aggregate_report_to_elasticsearch(_aggregate_report())
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("dmarc_aggregate-2024-01-15", index_calls)
|
|
# Fixture begin_date/interval_begin is 2024-01-15 00:00:00 UTC.
|
|
self.assertEqual(
|
|
mock_doc_cls.call_args.kwargs["date_begin"].timestamp(), 1705276800
|
|
)
|
|
|
|
def test_save_populates_combined_dkim_and_spf_fields(self):
|
|
"""Regression guard for issue #169: two DKIM signatures on one
|
|
record must yield exactly two combined entries, not a 4-way
|
|
cross-product. autospec=True is required on the save patch so
|
|
mock_save.call_args captures the doc instance as ``self``."""
|
|
report = _aggregate_report()
|
|
report["records"][0]["auth_results"] = {
|
|
"dkim": [
|
|
{
|
|
"domain": "example.net",
|
|
"selector": "net1",
|
|
"result": "fail",
|
|
"human_result": None,
|
|
},
|
|
{
|
|
"domain": "example.org",
|
|
"selector": "org1",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
},
|
|
],
|
|
"spf": [
|
|
{
|
|
"domain": "example.org",
|
|
"scope": "mfrom",
|
|
"result": "pass",
|
|
"human_result": None,
|
|
},
|
|
],
|
|
}
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch(
|
|
"parsedmarc.elastic.Index",
|
|
return_value=MagicMock(exists=MagicMock(return_value=True)),
|
|
),
|
|
patch.object(
|
|
elastic_module._AggregateReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_aggregate_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args[0][0]
|
|
self.assertEqual(
|
|
list(doc.dkim_results_combined),
|
|
["net1 / example.net / fail", "org1 / example.org / pass"],
|
|
)
|
|
self.assertEqual(list(doc.spf_results_combined), ["mfrom / example.org / pass"])
|
|
|
|
|
|
class TestAggregateDocPassedDmarc(unittest.TestCase):
|
|
"""The _AggregateReportDoc.save() override derives passed_dmarc — the
|
|
field dashboards filter on for DMARC pass/fail — from SPF/DKIM
|
|
alignment. The SDK parent (elasticsearch.dsl.Document.save) is mocked so
|
|
no cluster is needed."""
|
|
|
|
def test_passed_dmarc_derived_from_alignment(self):
|
|
cases = [
|
|
(True, False, True),
|
|
(False, True, True),
|
|
(True, True, True),
|
|
(False, False, False),
|
|
]
|
|
for spf_aligned, dkim_aligned, expected in cases:
|
|
with self.subTest(spf=spf_aligned, dkim=dkim_aligned):
|
|
with patch.object(
|
|
elastic_module.Document, "save", return_value=None
|
|
) as mock_super_save:
|
|
doc = elastic_module._AggregateReportDoc(
|
|
spf_aligned=spf_aligned, dkim_aligned=dkim_aligned
|
|
)
|
|
doc.save()
|
|
mock_super_save.assert_called_once()
|
|
self.assertEqual(bool(doc.passed_dmarc), expected)
|
|
|
|
|
|
class TestAggregateDocCombinedResults(unittest.TestCase):
|
|
"""add_dkim_result/add_spf_result never touch the network, so these
|
|
construct _AggregateReportDoc directly rather than going through the
|
|
save_* entry point."""
|
|
|
|
def test_add_dkim_result_appends_combined_string(self):
|
|
"""Regression guard for issue #169: dkim_results/spf_results are
|
|
arrays of objects that the engine dynamic-maps as plain ``object``
|
|
(not ``nested``) and flattens, so Kibana/Grafana tables cannot
|
|
terms-aggregate their subfields without producing a cross-product
|
|
of selector/domain/result values. The composed
|
|
"selector / domain / result" string preserves the per-signature
|
|
pairing that the flattened array loses."""
|
|
doc = elastic_module._AggregateReportDoc()
|
|
doc.add_dkim_result(
|
|
domain="example.net", selector="net1", result="fail", human_result=None
|
|
)
|
|
doc.add_dkim_result(
|
|
domain="example.org", selector="org1", result="pass", human_result=None
|
|
)
|
|
expected = ["net1 / example.net / fail", "org1 / example.org / pass"]
|
|
# dkim_results_combined is declared as Text(multi=True, ...); the SDK
|
|
# stub types the class attribute as Text (no Iterable protocol),
|
|
# even though the runtime value is an AttrList once multi=True is
|
|
# set. Same category of stub gap as the Q()/meta.index ignores in
|
|
# elastic.py.
|
|
self.assertEqual(list(doc.dkim_results_combined), expected) # pyright: ignore[reportArgumentType]
|
|
self.assertEqual(doc.to_dict()["dkim_results_combined"], expected)
|
|
|
|
def test_add_spf_result_appends_combined_string(self):
|
|
doc = elastic_module._AggregateReportDoc()
|
|
doc.add_spf_result(
|
|
domain="example.org", scope="mfrom", result="pass", human_result=None
|
|
)
|
|
expected = ["mfrom / example.org / pass"]
|
|
self.assertEqual(list(doc.spf_results_combined), expected) # pyright: ignore[reportArgumentType]
|
|
self.assertEqual(doc.to_dict()["spf_results_combined"], expected)
|
|
|
|
def test_spf_result_serializes_under_singular_result_key(self):
|
|
"""The _SPFResult class previously declared a dead ``results``
|
|
(plural) field while the save path wrote ``result``; verify the
|
|
serialized inner doc actually uses the singular key."""
|
|
doc = elastic_module._AggregateReportDoc()
|
|
doc.add_spf_result(
|
|
domain="example.org", scope="mfrom", result="pass", human_result=None
|
|
)
|
|
d = doc.to_dict()["spf_results"][0]
|
|
self.assertEqual(d["result"], "pass")
|
|
self.assertNotIn("results", d)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# save_failure_report_to_elasticsearch
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSaveFailureReport(unittest.TestCase):
|
|
def test_save_emits_one_document(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
mock_save.assert_called_once()
|
|
|
|
def test_already_saved_raises_on_dedup_hit(self):
|
|
"""Failure-report dedup uses arrival_date + From/To/Subject
|
|
from the parsed sample. A hit means we've already indexed
|
|
this exact failure sample."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_populated_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
with self.assertRaises(AlreadySaved):
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
mock_save.assert_not_called()
|
|
|
|
def test_save_exception_wraps_to_elasticsearch_error(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc,
|
|
"save",
|
|
side_effect=RuntimeError("disk"),
|
|
),
|
|
):
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
self.assertIn("disk", str(ctx.exception))
|
|
|
|
def test_search_exception_wraps_to_elasticsearch_error(self):
|
|
"""The duplicate check's search failing is a ElasticsearchError, as it is for
|
|
the aggregate and SMTP TLS saves, not the search library's own error."""
|
|
bad_search = MagicMock()
|
|
bad_search.execute.side_effect = RuntimeError("network")
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=bad_search),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
self.assertIn("network", str(ctx.exception))
|
|
mock_save.assert_not_called()
|
|
|
|
def test_overlong_sample_date_is_invalid_failure_report(self):
|
|
"""A sample Date too long to be a date is an InvalidFailureReport,
|
|
raised before the duplicate search, not a bare ValueError"""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["date"] = "1" * 200
|
|
search = MagicMock()
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=search),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
with self.assertRaises(InvalidFailureReport):
|
|
save_failure_report_to_elasticsearch(report)
|
|
search.execute.assert_not_called()
|
|
mock_save.assert_not_called()
|
|
|
|
def test_header_with_empty_name_is_left_out(self):
|
|
"""An empty header name is not a valid field name, so the header is
|
|
skipped and the others are still saved. mail-parser drops a header
|
|
line that starts with ":" before it reaches the sample, so the
|
|
parsed sample is built directly."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["headers"][""] = "orphan value"
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
headers = mock_save.call_args.args[0].sample.headers
|
|
self.assertNotIn("", headers)
|
|
self.assertEqual(headers["subject"], "Test")
|
|
|
|
def test_keyerror_wraps_to_invalid_failure_report(self):
|
|
"""A malformed failure report (missing a required field) is
|
|
surfaced as InvalidFailureReport so the caller can route it
|
|
differently from infra errors."""
|
|
report = _failure_report()
|
|
del report["feedback_type"]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save"),
|
|
):
|
|
with self.assertRaises(InvalidFailureReport):
|
|
save_failure_report_to_elasticsearch(report)
|
|
|
|
def test_index_dedup_pattern_searches_both_old_and_new_names(self):
|
|
"""The split-PR rename forensic→failure left existing data
|
|
in dmarc_forensic*; the dedup search must check both names
|
|
so re-runs don't double-index."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save"),
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
search_index = mock_search_cls.call_args.kwargs["index"]
|
|
self.assertIn("dmarc_failure*", search_index)
|
|
self.assertIn("dmarc_forensic*", search_index)
|
|
|
|
def test_index_name_uses_arrival_date_for_monthly_partition(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._FailureReportDoc, "save"),
|
|
):
|
|
save_failure_report_to_elasticsearch(
|
|
_failure_report(), monthly_indexes=True
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("dmarc_failure-2024-01", index_calls)
|
|
|
|
@unittest.skipUnless(hasattr(time, "tzset"), "requires POSIX time.tzset()")
|
|
def test_arrival_date_epoch_is_utc_regardless_of_host_timezone(self):
|
|
"""arrival_date_utc is a UTC wall-clock string; the epoch-ms
|
|
value stored in the document (and used in the dedup query) must
|
|
be its true UTC epoch on any host. Regression test for
|
|
https://github.com/domainaware/parsedmarc/issues/811 (bug 1):
|
|
the naive parse used to shift the stored epoch by the host's
|
|
UTC offset."""
|
|
force_tz(self)
|
|
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch("parsedmarc.elastic._FailureReportDoc") as mock_doc_cls,
|
|
):
|
|
save_failure_report_to_elasticsearch(_failure_report())
|
|
# Fixture arrival_date_utc is 2024-01-01 00:00:00 UTC.
|
|
self.assertEqual(mock_doc_cls.call_args.kwargs["arrival_date"], 1704067200000)
|
|
|
|
def test_failure_search_index_with_suffix_and_prefix(self):
|
|
"""When both suffix and prefix are set, the dedup search
|
|
pattern joins them onto BOTH dmarc_failure* and
|
|
dmarc_forensic* (the rename back-compat)."""
|
|
with (
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save"),
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
save_failure_report_to_elasticsearch(
|
|
_failure_report(),
|
|
index_suffix="tenant_a",
|
|
index_prefix="cust_",
|
|
)
|
|
search_index = mock_search_cls.call_args.kwargs["index"]
|
|
self.assertIn("cust_dmarc_failure_tenant_a*", search_index)
|
|
self.assertIn("cust_dmarc_forensic_tenant_a*", search_index)
|
|
|
|
def test_failure_index_honours_suffix_and_prefix(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._FailureReportDoc, "save"),
|
|
):
|
|
save_failure_report_to_elasticsearch(
|
|
_failure_report(),
|
|
index_suffix="tenant_a",
|
|
index_prefix="cust_",
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("cust_dmarc_failure_tenant_a-2024-01-01", index_calls)
|
|
|
|
def test_from_header_with_empty_display_name(self):
|
|
"""When the From display name is empty, the code uses the
|
|
address alone (covers the early-return branch in the
|
|
display-name handling)."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["headers"]["From"] = [["", "sender@example.com"]]
|
|
report["parsed_sample"]["headers"]["To"] = [["", "rcpt@example.com"]]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
|
|
def test_to_header_with_non_empty_display_joins_with_brackets(self):
|
|
"""The other branch: non-empty display joins display+addr
|
|
with " <" and appends ">", e.g. 'RT <rcpt@example.com>'.
|
|
Asserts the joined string actually reaches the saved document
|
|
(see test_reply_to_header_flattened_and_indexed for the
|
|
autospec-save pattern), not merely that save ran."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["headers"]["To"] = [["RT", "rcpt@example.com"]]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
doc = mock_save.call_args.args[0]
|
|
self.assertEqual(doc.sample.headers["to"], "RT <rcpt@example.com>")
|
|
|
|
def test_sample_address_lists_indexed_for_reply_to_cc_bcc_attachments(self):
|
|
"""A failure report sample can carry reply_to / cc / bcc /
|
|
attachments. Each populates a nested InnerDoc on the sample;
|
|
this drives all four add_* helper paths (nested-doc contents
|
|
are asserted separately in
|
|
test_reply_to_header_flattened_and_indexed)."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["reply_to"] = [
|
|
{"display_name": "RT", "address": "rt@example.com"}
|
|
]
|
|
report["parsed_sample"]["cc"] = [
|
|
{"display_name": "CC", "address": "cc@example.com"}
|
|
]
|
|
report["parsed_sample"]["bcc"] = [
|
|
{"display_name": "", "address": "bcc@example.com"}
|
|
]
|
|
report["parsed_sample"]["attachments"] = [
|
|
{
|
|
"filename": "a.pdf",
|
|
"mail_content_type": "application/pdf",
|
|
"sha256": "deadbeef",
|
|
}
|
|
]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._FailureReportDoc, "save") as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
|
|
def test_reply_to_header_flattened_and_indexed(self):
|
|
"""A Reply-To header is flattened to a display string on
|
|
``sample.headers["reply-to"]`` — so the failure dashboard's
|
|
``sample.headers.reply-to.keyword`` column resolves — and each
|
|
Reply-To address also populates the nested ``sample.reply_to``
|
|
docs. Asserts on the document handed to .save(), not merely
|
|
that save ran."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["headers"]["Reply-To"] = [
|
|
["Real One", "real@phish.example"]
|
|
]
|
|
report["parsed_sample"]["reply_to"] = [
|
|
{"display_name": "Real One", "address": "real@phish.example"}
|
|
]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args.args[0]
|
|
self.assertEqual(
|
|
doc.sample.headers["reply-to"], "Real One <real@phish.example>"
|
|
)
|
|
self.assertEqual(
|
|
[a.address for a in doc.sample.reply_to], ["real@phish.example"]
|
|
)
|
|
|
|
def test_reply_to_header_without_display_name_flattens_to_address(self):
|
|
"""A Reply-To header with no display name flattens to the bare
|
|
address — the empty-display branch of the header flattening,
|
|
matching the From/To handling."""
|
|
report = _failure_report()
|
|
report["parsed_sample"]["headers"]["Reply-To"] = [["", "noname@phish.example"]]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args.args[0]
|
|
self.assertEqual(doc.sample.headers["reply-to"], "noname@phish.example")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# save_smtp_tls_report_to_elasticsearch
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSaveSmtpTlsReport(unittest.TestCase):
|
|
def test_save_emits_one_document(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save") as mock_save,
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(_smtp_tls_report())
|
|
mock_save.assert_called_once()
|
|
|
|
def test_already_saved_raises_on_dedup_hit(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_populated_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save") as mock_save,
|
|
):
|
|
with self.assertRaises(AlreadySaved):
|
|
save_smtp_tls_report_to_elasticsearch(_smtp_tls_report())
|
|
mock_save.assert_not_called()
|
|
|
|
def test_search_exception_wraps_to_elasticsearch_error(self):
|
|
bad = MagicMock()
|
|
bad.execute.side_effect = RuntimeError("network")
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=bad),
|
|
patch("parsedmarc.elastic.Index"),
|
|
):
|
|
with self.assertRaises(ElasticsearchError):
|
|
save_smtp_tls_report_to_elasticsearch(_smtp_tls_report())
|
|
|
|
def test_save_exception_wraps_to_elasticsearch_error(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._SMTPTLSReportDoc,
|
|
"save",
|
|
side_effect=RuntimeError("disk"),
|
|
),
|
|
):
|
|
with self.assertRaises(ElasticsearchError):
|
|
save_smtp_tls_report_to_elasticsearch(_smtp_tls_report())
|
|
|
|
def test_index_name_uses_begin_date_for_monthly_partition(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save"),
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(
|
|
_smtp_tls_report(), monthly_indexes=True
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("smtp_tls-2024-02", index_calls)
|
|
|
|
def test_index_name_honours_suffix_and_prefix(self):
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save"),
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(
|
|
_smtp_tls_report(), index_suffix="t1", index_prefix="cust_"
|
|
)
|
|
index_calls = [c.args[0] for c in mock_index_cls.call_args_list]
|
|
self.assertIn("cust_smtp_tls_t1-2024-02-03", index_calls)
|
|
|
|
def test_policy_without_strings_or_mx_patterns(self):
|
|
"""policy_strings / mx_host_patterns are optional in the
|
|
report shape — verify the branch where they're absent."""
|
|
report = _smtp_tls_report()
|
|
for policy in report["policies"]:
|
|
policy.pop("policy_strings", None)
|
|
policy.pop("mx_host_patterns", None)
|
|
policy.pop("failure_details", None)
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save") as mock_save,
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
|
|
def test_failure_details_all_optional_fields_populated(self):
|
|
"""Exercise every optional field in failure_details so the
|
|
full set of `if "x" in failure_detail` branches runs."""
|
|
report = _smtp_tls_report()
|
|
report["policies"][0]["failure_details"] = [
|
|
{
|
|
"result_type": "certificate-expired",
|
|
"failed_session_count": 1,
|
|
"receiving_mx_hostname": "mx.example.com",
|
|
"additional_information_uri": "https://example.com/why",
|
|
"failure_reason_code": "ERR_CERT",
|
|
"ip_address": "10.0.0.5",
|
|
"receiving_ip": "10.0.0.2",
|
|
"receiving_mx_helo": "mx.helo.example.com",
|
|
"sending_mta_ip": "10.0.0.1",
|
|
}
|
|
]
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(elastic_module._SMTPTLSReportDoc, "save") as mock_save,
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(report)
|
|
mock_save.assert_called_once()
|
|
|
|
def test_save_populates_combined_policy_and_failure_detail_fields(self):
|
|
"""Regression guard for the SMTP TLS analogue of issue #169:
|
|
policies and their failure_details are object arrays, so stacked
|
|
terms aggregations on their subfields cross-product just like
|
|
dkim_results/spf_results did. Two policies (one with two failure
|
|
details, one with none) must yield exactly two policies_combined
|
|
entries and two failure_details_combined entries, not a
|
|
cross-product. autospec=True is required on the save patch so
|
|
mock_save.call_args captures the doc instance as ``self``."""
|
|
report = _smtp_tls_report(
|
|
policies=[
|
|
{
|
|
"policy_domain": "example.com",
|
|
"policy_type": "sts",
|
|
"successful_session_count": 100,
|
|
"failed_session_count": 2,
|
|
"failure_details": [
|
|
{
|
|
"result_type": "certificate-expired",
|
|
"failed_session_count": 1,
|
|
"sending_mta_ip": "192.0.2.1",
|
|
"receiving_ip": "203.0.113.1",
|
|
"receiving_mx_hostname": "mx1.example.com",
|
|
"additional_info_uri": (
|
|
"https://reports.example.com/tls-help"
|
|
),
|
|
},
|
|
{
|
|
"result_type": "starttls-not-supported",
|
|
"failed_session_count": 1,
|
|
"sending_mta_ip": "192.0.2.2",
|
|
"receiving_ip": "203.0.113.2",
|
|
"receiving_mx_hostname": "mx2.example.com",
|
|
},
|
|
],
|
|
},
|
|
{
|
|
"policy_domain": "example.net",
|
|
"policy_type": "tlsa",
|
|
"successful_session_count": 50,
|
|
"failed_session_count": 0,
|
|
},
|
|
]
|
|
)
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._SMTPTLSReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args[0][0]
|
|
self.assertEqual(
|
|
list(doc.policies_combined), ["example.com / sts", "example.net / tlsa"]
|
|
)
|
|
expected_detail_expired = (
|
|
"example.com / sts / certificate-expired / 192.0.2.1 / "
|
|
"203.0.113.1 / mx1.example.com"
|
|
)
|
|
expected_detail_starttls = (
|
|
"example.com / sts / starttls-not-supported / 192.0.2.2 / "
|
|
"203.0.113.2 / mx2.example.com"
|
|
)
|
|
self.assertEqual(
|
|
list(doc.failure_details_combined),
|
|
[expected_detail_expired, expected_detail_starttls],
|
|
)
|
|
# The parser emits additional_info_uri (SMTPTLSFailureDetailsOptional
|
|
# in types.py); the saver must persist it on the declared
|
|
# additional_information_uri field rather than dropping it.
|
|
self.assertEqual(
|
|
doc.policies[0].failure_details[0].additional_information_uri,
|
|
"https://reports.example.com/tls-help",
|
|
)
|
|
|
|
def test_save_blank_failure_detail_fields_omitted_from_ip_fields(self):
|
|
"""Blank optional failure-detail fields must not reach the Ip()
|
|
fields (issue #915).
|
|
|
|
samples/smtp_tls/empty_failure_detail_fields.json reproduces a
|
|
real reporter's shape: sending-mta-ip/receiving-ip sent as "" on
|
|
an sts-policy-fetch-error. Verified directly against
|
|
elasticsearch.dsl: Document.save() validates by calling
|
|
full_clean() before any network call, and an Ip() field's
|
|
validation calls Python's ipaddress.ip_address(""), which raises a
|
|
bare ValueError ("'' does not appear to be an IPv4 or IPv6
|
|
address") rather than a caught ValidationException -- so an empty
|
|
string here previously discarded the whole report instead of
|
|
indexing it with a blank IP.
|
|
|
|
save() is mocked (per this module's convention, so no real
|
|
cluster is needed), which also means it never runs full_clean()
|
|
itself; call it explicitly on the captured document so this test
|
|
exercises the same validation a real save() would, and fails with
|
|
that ValueError on unfixed parsedmarc/__init__.py.
|
|
"""
|
|
result = parse_report_file(
|
|
"samples/smtp_tls/empty_failure_detail_fields.json", offline=True
|
|
)
|
|
report = cast(dict, result["report"])
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._SMTPTLSReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_smtp_tls_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args[0][0]
|
|
doc.full_clean()
|
|
failure_detail = doc.policies[0].failure_details[0]
|
|
self.assertIsNone(failure_detail.sending_mta_ip)
|
|
self.assertIsNone(failure_detail.receiving_ip)
|
|
self.assertEqual(failure_detail.failure_reason_code, "no-policy-served")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Data streams (issue #842)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _not_found() -> NotFoundError:
|
|
"""The exception elasticsearch-py raises for an HTTP 404."""
|
|
return NotFoundError(
|
|
"index_not_found_exception", meta=MagicMock(status=404), body={}
|
|
)
|
|
|
|
|
|
def _stream_listing(*names: str) -> dict:
|
|
"""A GET _data_stream/<name> response body listing *names*."""
|
|
return {"data_streams": [{"name": name} for name in names]}
|
|
|
|
|
|
@contextmanager
|
|
def _registered_client() -> Iterator[MagicMock]:
|
|
"""Register a mock client as the ``default`` connection.
|
|
|
|
Both ``create_data_streams`` and ``Document.save`` resolve the client
|
|
through the connection registry, so registering the mock there (rather
|
|
than patching either function) lets the real save path run and the test
|
|
read what reached the transport. The previous registration is put back
|
|
afterwards.
|
|
"""
|
|
client = MagicMock()
|
|
client.index.return_value = {"_index": "x", "_id": "1", "result": "created"}
|
|
try:
|
|
previous = elastic_module.connections.get_connection("default")
|
|
except KeyError:
|
|
previous = None
|
|
elastic_module.connections.add_connection("default", client)
|
|
try:
|
|
yield client
|
|
finally:
|
|
if previous is None:
|
|
elastic_module.connections.remove_connection("default")
|
|
else:
|
|
elastic_module.connections.add_connection("default", previous)
|
|
|
|
|
|
class _DataStreamTestCase(unittest.TestCase):
|
|
"""Isolates each test from the module's data stream memo and the
|
|
Serverless flag."""
|
|
|
|
def setUp(self):
|
|
self._serverless = elastic_module._SERVERLESS
|
|
elastic_module._SERVERLESS = False
|
|
elastic_module._READY_DATA_STREAMS.clear()
|
|
|
|
def tearDown(self):
|
|
elastic_module._SERVERLESS = self._serverless
|
|
elastic_module._READY_DATA_STREAMS.clear()
|
|
|
|
|
|
class TestCreateDataStreams(_DataStreamTestCase):
|
|
def test_creates_template_and_stream_when_missing(self):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_data_streams(
|
|
["dmarc_aggregate"],
|
|
{"number_of_shards": 2, "number_of_replicas": 1},
|
|
)
|
|
template = client.indices.put_index_template.call_args.kwargs
|
|
self.assertEqual(template["name"], "dmarc_aggregate")
|
|
# Exact name, no wildcard: the template must never claim the
|
|
# date-suffixed indexes written without data streams.
|
|
self.assertEqual(template["index_patterns"], ["dmarc_aggregate"])
|
|
self.assertEqual(template["data_stream"], {})
|
|
self.assertEqual(template["priority"], 501)
|
|
self.assertEqual(template["composed_of"], ["dmarc_aggregate@custom"])
|
|
self.assertEqual(
|
|
template["ignore_missing_component_templates"],
|
|
["dmarc_aggregate@custom"],
|
|
)
|
|
self.assertEqual(
|
|
template["template"],
|
|
{
|
|
"settings": {"number_of_shards": 2, "number_of_replicas": 1},
|
|
"mappings": {"properties": {"@timestamp": {"type": "date"}}},
|
|
},
|
|
)
|
|
self.assertIn("dmarc_aggregate@custom", template["meta"]["description"])
|
|
client.indices.create_data_stream.assert_called_once_with(
|
|
name="dmarc_aggregate"
|
|
)
|
|
# No concrete index is created for a stream.
|
|
client.indices.create.assert_not_called()
|
|
self.assertIn("dmarc_aggregate", elastic_module._READY_DATA_STREAMS)
|
|
|
|
def test_default_settings_are_one_shard_no_replicas(self):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_data_streams(["smtp_tls"])
|
|
settings = client.indices.put_index_template.call_args.kwargs["template"][
|
|
"settings"
|
|
]
|
|
self.assertEqual(settings, {"number_of_shards": 1, "number_of_replicas": 0})
|
|
|
|
def test_existing_stream_gets_template_but_is_not_recreated(self):
|
|
"""The template is put again so that settings changes reach the
|
|
next backing index; the stream itself already exists."""
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.return_value = _stream_listing(
|
|
"dmarc_failure"
|
|
)
|
|
create_data_streams(["dmarc_failure"])
|
|
client.indices.put_index_template.assert_called_once()
|
|
client.indices.create_data_stream.assert_not_called()
|
|
mock_index_cls.return_value.exists.assert_not_called()
|
|
self.assertIn("dmarc_failure", elastic_module._READY_DATA_STREAMS)
|
|
|
|
def test_concrete_index_holding_the_name_raises_without_writing(self):
|
|
"""Elasticsearch answers GET _data_stream/<name> for a name held by
|
|
a concrete index with 200 and an empty list, not a 404 (verified
|
|
against 8.19). Treating that 200 as "stream exists" would send
|
|
every document into the old undated index, such as one left by a
|
|
pre-5.0.0 release."""
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.return_value = _stream_listing()
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
create_data_streams(["dmarc_aggregate"])
|
|
mock_index_cls.assert_called_with("dmarc_aggregate")
|
|
self.assertIn("already exists", str(ctx.exception))
|
|
self.assertIn("dmarc_aggregate", str(ctx.exception))
|
|
client.indices.put_index_template.assert_not_called()
|
|
client.indices.create_data_stream.assert_not_called()
|
|
self.assertNotIn("dmarc_aggregate", elastic_module._READY_DATA_STREAMS)
|
|
|
|
def test_alias_holding_the_name_raises(self):
|
|
"""A missing stream is a 404; an alias with the name still exists
|
|
as far as Index.exists() is concerned."""
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
with self.assertRaises(ElasticsearchError):
|
|
create_data_streams(["smtp_tls"])
|
|
client.indices.put_index_template.assert_not_called()
|
|
client.indices.create_data_stream.assert_not_called()
|
|
|
|
def test_ready_stream_is_not_set_up_again(self):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_data_streams(["dmarc_aggregate"])
|
|
create_data_streams(["dmarc_aggregate"])
|
|
self.assertEqual(client.indices.get_data_stream.call_count, 1)
|
|
self.assertEqual(client.indices.put_index_template.call_count, 1)
|
|
self.assertEqual(client.indices.create_data_stream.call_count, 1)
|
|
|
|
def test_set_hosts_forgets_ready_streams(self):
|
|
"""A new connection may be a different cluster or carry new index
|
|
settings, so the template has to be put again."""
|
|
elastic_module._READY_DATA_STREAMS.add("dmarc_aggregate")
|
|
with patch("parsedmarc.elastic.connections.create_connection"):
|
|
set_hosts("es:9200")
|
|
self.assertEqual(elastic_module._READY_DATA_STREAMS, set())
|
|
|
|
def test_sdk_error_is_wrapped_and_retried_next_time(self):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
client.indices.put_index_template.side_effect = RuntimeError("cluster down")
|
|
with self.assertRaises(ElasticsearchError) as ctx:
|
|
create_data_streams(["dmarc_aggregate"])
|
|
self.assertIn("cluster down", str(ctx.exception))
|
|
self.assertNotIn("dmarc_aggregate", elastic_module._READY_DATA_STREAMS)
|
|
client.indices.create_data_stream.assert_not_called()
|
|
|
|
client.indices.put_index_template.side_effect = None
|
|
create_data_streams(["dmarc_aggregate"])
|
|
client.indices.create_data_stream.assert_called_once_with(
|
|
name="dmarc_aggregate"
|
|
)
|
|
self.assertIn("dmarc_aggregate", elastic_module._READY_DATA_STREAMS)
|
|
|
|
def test_serverless_strips_rejected_settings_from_template(self):
|
|
elastic_module._SERVERLESS = True
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_data_streams(
|
|
["dmarc_aggregate"],
|
|
{
|
|
"number_of_shards": 1,
|
|
"number_of_replicas": 0,
|
|
"refresh_interval": "5s",
|
|
},
|
|
)
|
|
settings = client.indices.put_index_template.call_args.kwargs["template"][
|
|
"settings"
|
|
]
|
|
self.assertEqual(settings, {"refresh_interval": "5s"})
|
|
|
|
|
|
class TestSaveToDataStreams(_DataStreamTestCase):
|
|
"""Each save function, run through the real Document.save() into a
|
|
mock client: in stream mode the document goes to the undated name
|
|
with op_type=create and an @timestamp; in the default mode it goes to
|
|
the dated index as before, with the same op_type and @timestamp."""
|
|
|
|
def _save(self, save_function, report, **kwargs):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_function(report, **kwargs)
|
|
return client, mock_search_cls, mock_index_cls
|
|
|
|
def test_aggregate_report_goes_to_the_stream(self):
|
|
client, mock_search_cls, mock_index_cls = self._save(
|
|
save_aggregate_report_to_elasticsearch,
|
|
_aggregate_report(),
|
|
index_prefix="cust_",
|
|
index_suffix="tenant_a",
|
|
# Ignored in stream mode.
|
|
monthly_indexes=True,
|
|
use_data_streams=True,
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "cust_dmarc_aggregate_tenant_a")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 1, 15, tzinfo=timezone.utc),
|
|
)
|
|
self.assertEqual(index_call["body"]["report_id"], "agg-1")
|
|
self.assertEqual(
|
|
client.indices.put_index_template.call_args.kwargs["index_patterns"],
|
|
["cust_dmarc_aggregate_tenant_a"],
|
|
)
|
|
client.indices.create_data_stream.assert_called_once_with(
|
|
name="cust_dmarc_aggregate_tenant_a"
|
|
)
|
|
client.indices.create.assert_not_called()
|
|
# The dedup search still uses the wildcard, which matches the
|
|
# stream as well as dated indexes written before the switch.
|
|
self.assertEqual(
|
|
mock_search_cls.call_args.kwargs["index"],
|
|
"cust_dmarc_aggregate_tenant_a*",
|
|
)
|
|
|
|
def test_aggregate_report_dated_mode_unchanged_apart_from_timestamp_and_op_type(
|
|
self,
|
|
):
|
|
client, _, mock_index_cls = self._save(
|
|
save_aggregate_report_to_elasticsearch, _aggregate_report()
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "dmarc_aggregate-2024-01-15")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 1, 15, tzinfo=timezone.utc),
|
|
)
|
|
client.indices.create.assert_called_once()
|
|
client.indices.put_index_template.assert_not_called()
|
|
client.indices.create_data_stream.assert_not_called()
|
|
|
|
def test_failure_report_goes_to_the_stream(self):
|
|
client, mock_search_cls, mock_index_cls = self._save(
|
|
save_failure_report_to_elasticsearch,
|
|
_failure_report(),
|
|
monthly_indexes=True,
|
|
use_data_streams=True,
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "dmarc_failure")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 1, 1, tzinfo=timezone.utc),
|
|
)
|
|
client.indices.create_data_stream.assert_called_once_with(name="dmarc_failure")
|
|
client.indices.create.assert_not_called()
|
|
self.assertEqual(
|
|
mock_search_cls.call_args.kwargs["index"],
|
|
"dmarc_failure*,dmarc_forensic*",
|
|
)
|
|
|
|
def test_failure_report_dated_mode_unchanged_apart_from_timestamp_and_op_type(self):
|
|
client, _, _ = self._save(
|
|
save_failure_report_to_elasticsearch, _failure_report()
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "dmarc_failure-2024-01-01")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 1, 1, tzinfo=timezone.utc),
|
|
)
|
|
client.indices.create_data_stream.assert_not_called()
|
|
|
|
def test_smtp_tls_report_goes_to_the_stream(self):
|
|
client, mock_search_cls, mock_index_cls = self._save(
|
|
save_smtp_tls_report_to_elasticsearch,
|
|
_smtp_tls_report(),
|
|
index_prefix="cust_",
|
|
use_data_streams=True,
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "cust_smtp_tls")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 2, 3, tzinfo=timezone.utc),
|
|
)
|
|
client.indices.create_data_stream.assert_called_once_with(name="cust_smtp_tls")
|
|
client.indices.create.assert_not_called()
|
|
self.assertEqual(mock_search_cls.call_args.kwargs["index"], "cust_smtp_tls*")
|
|
|
|
def test_smtp_tls_report_dated_mode_unchanged_apart_from_timestamp_and_op_type(
|
|
self,
|
|
):
|
|
client, _, _ = self._save(
|
|
save_smtp_tls_report_to_elasticsearch, _smtp_tls_report()
|
|
)
|
|
index_call = client.index.call_args.kwargs
|
|
self.assertEqual(index_call["index"], "smtp_tls-2024-02-03")
|
|
self.assertEqual(index_call["op_type"], "create")
|
|
self.assertEqual(
|
|
index_call["body"]["@timestamp"],
|
|
datetime(2024, 2, 3, tzinfo=timezone.utc),
|
|
)
|
|
client.indices.create_data_stream.assert_not_called()
|
|
|
|
def test_stream_set_up_once_for_a_multi_record_report(self):
|
|
report = _aggregate_report()
|
|
report["records"].append(report["records"][0].copy())
|
|
client, _, _ = self._save(
|
|
save_aggregate_report_to_elasticsearch, report, use_data_streams=True
|
|
)
|
|
self.assertEqual(client.index.call_count, 2)
|
|
self.assertEqual(client.indices.put_index_template.call_count, 1)
|
|
|
|
def test_name_collision_saves_nothing(self):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = True
|
|
with self.assertRaises(ElasticsearchError):
|
|
save_smtp_tls_report_to_elasticsearch(
|
|
_smtp_tls_report(), use_data_streams=True
|
|
)
|
|
client.index.assert_not_called()
|
|
|
|
|
|
class TestMigrateIndexesWithDataStream(unittest.TestCase):
|
|
def test_legacy_fo_migration_skips_a_stream_with_the_name(self):
|
|
"""With use_data_streams the undated legacy name is the stream
|
|
itself. Index.exists() is true for it, and the field mapping comes
|
|
back keyed by a backing index; its fo is text, so nothing is
|
|
migrated or deleted."""
|
|
with (
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.reindex") as mock_reindex,
|
|
):
|
|
index = mock_index_cls.return_value
|
|
index.exists.return_value = True
|
|
index.get_field_mapping.return_value = {
|
|
".ds-dmarc_aggregate-2026.10.31-000001": {
|
|
"mappings": {
|
|
"published_policy.fo": {
|
|
"full_name": "published_policy.fo",
|
|
"mapping": {"fo": {"type": "text"}},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
migrate_indexes(legacy_fo_indexes=["dmarc_aggregate"])
|
|
mock_reindex.assert_not_called()
|
|
index.create.assert_not_called()
|
|
index.delete.assert_not_called()
|
|
|
|
|
|
class TestBackwardCompatAlias(unittest.TestCase):
|
|
def test_save_forensic_alias_points_to_save_failure(self):
|
|
self.assertIs(
|
|
elastic_module.save_forensic_report_to_elasticsearch,
|
|
elastic_module.save_failure_report_to_elasticsearch,
|
|
)
|
|
|
|
def test_forensic_doc_alias_points_to_failure_doc(self):
|
|
self.assertIs(
|
|
elastic_module._ForensicReportDoc, elastic_module._FailureReportDoc
|
|
)
|
|
self.assertIs(
|
|
elastic_module._ForensicSampleDoc, elastic_module._FailureSampleDoc
|
|
)
|
|
|
|
|
|
class TestMappingGuards(_DataStreamTestCase):
|
|
"""New indexes and data stream templates carry explicit mappings
|
|
(GHSA-qpcg-29vr-jwm3).
|
|
|
|
Before 11.2.2 they were created with settings only, so the cluster
|
|
inferred every field's type from the first document, with
|
|
``date_detection`` on: an aggregate report with ``report_id``
|
|
``2026-11-09`` mapped ``report_id`` as a date for its day, a failure
|
|
sample header ``Subject.x`` mapped ``sample.headers.subject`` as an
|
|
object, and invented header names used up the 1,000-field limit, after
|
|
which legitimate reports for that index were rejected.
|
|
"""
|
|
|
|
def _save_dated(self, save_function, report):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_function(report)
|
|
client.indices.create.assert_called_once()
|
|
return client
|
|
|
|
def _created_mappings(self, save_function, report):
|
|
client = self._save_dated(save_function, report)
|
|
return client.indices.create.call_args.kwargs["body"]["mappings"]
|
|
|
|
def _template_mappings(self, save_function, report):
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Search") as mock_search_cls,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
mock_search_cls.return_value.execute.return_value = []
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_function(report, use_data_streams=True)
|
|
template = client.indices.put_index_template.call_args.kwargs
|
|
return template["template"]["mappings"]
|
|
|
|
def _assert_dates_declared(self, mappings, names):
|
|
for name in names:
|
|
self.assertEqual(mappings["properties"][name], {"type": "date"}, name)
|
|
|
|
def test_aggregate_index_turns_date_detection_off(self):
|
|
mappings = self._created_mappings(
|
|
save_aggregate_report_to_elasticsearch, _aggregate_report()
|
|
)
|
|
self.assertIs(mappings["date_detection"], False)
|
|
self._assert_dates_declared(
|
|
mappings, ["@timestamp", "date_range", "date_begin", "date_end"]
|
|
)
|
|
self.assertNotIn("sample", mappings["properties"])
|
|
# report_id stays dynamic: with date detection off a date-shaped
|
|
# value maps it as a string, not a date.
|
|
self.assertNotIn("report_id", mappings["properties"])
|
|
|
|
def test_smtp_tls_index_turns_date_detection_off(self):
|
|
mappings = self._created_mappings(
|
|
save_smtp_tls_report_to_elasticsearch, _smtp_tls_report()
|
|
)
|
|
self.assertIs(mappings["date_detection"], False)
|
|
self._assert_dates_declared(
|
|
mappings, ["@timestamp", "date_range", "date_begin", "date_end"]
|
|
)
|
|
self.assertNotIn("sample", mappings["properties"])
|
|
|
|
def test_failure_index_maps_sample_headers_without_dynamic_fields(self):
|
|
mappings = self._created_mappings(
|
|
save_failure_report_to_elasticsearch, _failure_report()
|
|
)
|
|
self.assertIs(mappings["date_detection"], False)
|
|
self._assert_dates_declared(mappings, ["@timestamp", "arrival_date"])
|
|
sample = mappings["properties"]["sample"]["properties"]
|
|
self.assertEqual(sample["date"], {"type": "date"})
|
|
headers = sample["headers"]
|
|
self.assertEqual(headers["type"], "object")
|
|
self.assertIs(headers["dynamic"], False)
|
|
string_field = {
|
|
"type": "text",
|
|
"fields": {"keyword": {"type": "keyword", "ignore_above": 256}},
|
|
}
|
|
for name in ("from", "to", "subject", "date", "message-id", "cc"):
|
|
self.assertEqual(headers["properties"][name], string_field, name)
|
|
for name in headers["properties"]:
|
|
# Stored names are lower-cased with "." replaced, so a declared
|
|
# name must be in that form or no stored header can match it.
|
|
self.assertEqual(name, name.lower().replace(".", "_"), name)
|
|
|
|
def test_failure_mapping_declares_every_header_the_dashboards_query(self):
|
|
dashboards = Path(__file__).resolve().parent.parent / "dashboards"
|
|
referenced = set()
|
|
for path in dashboards.rglob("*"):
|
|
if path.is_file() and path.suffix in (".json", ".ndjson", ".xml"):
|
|
text = path.read_text(encoding="utf-8")
|
|
for match in re.finditer(r"sample\.headers\.([A-Za-z0-9_-]+)", text):
|
|
referenced.add(match.group(1).lower())
|
|
self.assertIn("x-mailer", referenced)
|
|
mappings = self._created_mappings(
|
|
save_failure_report_to_elasticsearch, _failure_report()
|
|
)
|
|
declared = mappings["properties"]["sample"]["properties"]["headers"][
|
|
"properties"
|
|
]
|
|
self.assertLessEqual(referenced, set(declared))
|
|
|
|
def test_data_stream_templates_carry_the_mappings(self):
|
|
for save_function, report, has_sample in (
|
|
(save_aggregate_report_to_elasticsearch, _aggregate_report(), False),
|
|
(save_failure_report_to_elasticsearch, _failure_report(), True),
|
|
(save_smtp_tls_report_to_elasticsearch, _smtp_tls_report(), False),
|
|
):
|
|
case = save_function.__name__
|
|
elastic_module._READY_DATA_STREAMS.clear()
|
|
mappings = self._template_mappings(save_function, report)
|
|
self.assertIs(mappings["date_detection"], False, case)
|
|
self.assertEqual(
|
|
mappings["properties"]["@timestamp"], {"type": "date"}, case
|
|
)
|
|
self.assertEqual("sample" in mappings["properties"], has_sample, case)
|
|
if has_sample:
|
|
headers = mappings["properties"]["sample"]["properties"]["headers"]
|
|
self.assertIs(headers["dynamic"], False, case)
|
|
self.assertIn("subject", headers["properties"], case)
|
|
|
|
def test_data_stream_template_adds_timestamp_without_changing_the_argument(
|
|
self,
|
|
):
|
|
mappings = {"date_detection": False, "properties": {"x": {"type": "long"}}}
|
|
with (
|
|
_registered_client() as client,
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
):
|
|
client.indices.get_data_stream.side_effect = _not_found()
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
create_data_streams(["s"], mappings=mappings)
|
|
template = client.indices.put_index_template.call_args.kwargs
|
|
self.assertEqual(
|
|
template["template"]["mappings"],
|
|
{
|
|
"date_detection": False,
|
|
"properties": {"x": {"type": "long"}, "@timestamp": {"type": "date"}},
|
|
},
|
|
)
|
|
self.assertEqual(
|
|
mappings, {"date_detection": False, "properties": {"x": {"type": "long"}}}
|
|
)
|
|
|
|
def test_dotted_header_name_is_stored_with_an_underscore(self):
|
|
report = _failure_report()
|
|
report["parsed_sample"] = dict(report["parsed_sample"])
|
|
report["parsed_sample"]["headers"] = {
|
|
"From": [["", "sender@example.com"]],
|
|
"Subject.x": "v",
|
|
"X.Y.Z": "w",
|
|
}
|
|
client = self._save_dated(save_failure_report_to_elasticsearch, report)
|
|
headers = client.index.call_args.kwargs["body"]["sample"]["headers"]
|
|
self.assertEqual(headers["subject_x"], "v")
|
|
self.assertEqual(headers["x_y_z"], "w")
|
|
self.assertNotIn("subject.x", headers)
|
|
self.assertNotIn("subject", headers)
|
|
# The address headers are still flattened under their usual keys.
|
|
self.assertEqual(headers["from"], "sender@example.com")
|
|
|
|
|
|
# Silence unused-import lint in the test module preamble.
|
|
_ = call
|
|
|
|
|
|
class TestAggregateIndexCap(unittest.TestCase):
|
|
"""One report may create at most MAX_INDEXES_PER_REPORT dated indexes;
|
|
the overflow records are saved to the report's first index."""
|
|
|
|
DAYS = 40
|
|
|
|
def _report(self):
|
|
report = _aggregate_report()
|
|
template = report["records"][0]
|
|
report["records"] = []
|
|
for day in range(self.DAYS):
|
|
record = copy.deepcopy(template)
|
|
begin = datetime(2024, 1, 1, tzinfo=timezone.utc) + timedelta(days=day)
|
|
end = begin + timedelta(days=1)
|
|
record["interval_begin"] = begin.strftime("%Y-%m-%d %H:%M:%S")
|
|
record["interval_end"] = end.strftime("%Y-%m-%d %H:%M:%S")
|
|
report["records"].append(record)
|
|
return report
|
|
|
|
def _save(self, **kwargs):
|
|
"""Save the report; return created index names, the (index,
|
|
date_begin) of each saved document and the logger mock."""
|
|
saved = []
|
|
|
|
def capture(doc, *args, **save_kwargs):
|
|
saved.append((doc.meta.index, doc.date_begin))
|
|
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection") as mock_get_conn,
|
|
patch("parsedmarc.elastic.logger") as mock_logger,
|
|
patch("parsedmarc.elastic.create_data_streams") as mock_streams,
|
|
patch.object(
|
|
elastic_module._AggregateReportDoc,
|
|
"save",
|
|
autospec=True,
|
|
side_effect=capture,
|
|
),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_aggregate_report_to_elasticsearch(self._report(), **kwargs)
|
|
created = [
|
|
c.kwargs["index"]
|
|
for c in mock_get_conn.return_value.indices.create.call_args_list
|
|
]
|
|
return created, saved, mock_logger, mock_streams
|
|
|
|
def test_daily_indexes_are_capped_and_overflow_goes_to_the_first(self):
|
|
created, saved, mock_logger, _ = self._save()
|
|
expected = [f"dmarc_aggregate-2024-01-{d:02d}" for d in range(1, 32)]
|
|
self.assertEqual(sorted(set(created)), expected)
|
|
self.assertEqual(len(saved), self.DAYS)
|
|
self.assertEqual([index for index, _ in saved[:31]], expected)
|
|
self.assertEqual(
|
|
[index for index, _ in saved[31:]], ["dmarc_aggregate-2024-01-01"] * 9
|
|
)
|
|
# The overflow records keep their own dates.
|
|
begins = [begin for _, begin in saved]
|
|
self.assertEqual(begins[31], datetime(2024, 2, 1, tzinfo=timezone.utc))
|
|
self.assertEqual(begins[39], datetime(2024, 2, 9, tzinfo=timezone.utc))
|
|
mock_logger.warning.assert_called_once()
|
|
self.assertIn("9 records", mock_logger.warning.call_args.args[0])
|
|
|
|
def test_routing_warning_escapes_the_report_id(self):
|
|
"""The report ID is sender-controlled; a CR/LF in it must not forge
|
|
a log line."""
|
|
report = self._report()
|
|
report["report_metadata"]["report_id"] = "poc\r\nforged"
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection"),
|
|
patch("parsedmarc.elastic.logger") as mock_logger,
|
|
patch.object(elastic_module._AggregateReportDoc, "save", autospec=True),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_aggregate_report_to_elasticsearch(report)
|
|
message = mock_logger.warning.call_args.args[0]
|
|
self.assertIn("poc\\r\\nforged", message)
|
|
self.assertNotIn("\n", message)
|
|
|
|
def test_monthly_indexes_are_not_affected(self):
|
|
created, saved, mock_logger, _ = self._save(monthly_indexes=True)
|
|
self.assertEqual(
|
|
sorted(set(created)), ["dmarc_aggregate-2024-01", "dmarc_aggregate-2024-02"]
|
|
)
|
|
self.assertEqual(
|
|
[index for index, _ in saved],
|
|
["dmarc_aggregate-2024-01"] * 31 + ["dmarc_aggregate-2024-02"] * 9,
|
|
)
|
|
mock_logger.warning.assert_not_called()
|
|
|
|
def test_data_streams_are_not_affected(self):
|
|
created, saved, mock_logger, mock_streams = self._save(use_data_streams=True)
|
|
self.assertEqual(created, [])
|
|
self.assertEqual({index for index, _ in saved}, {"dmarc_aggregate"})
|
|
self.assertEqual(len(saved), self.DAYS)
|
|
self.assertEqual(mock_streams.call_count, self.DAYS)
|
|
mock_logger.warning.assert_not_called()
|
|
|
|
|
|
class TestSaveFailureReportEmptyAddressHeaders(unittest.TestCase):
|
|
"""GHSA-4272-4r8g-6c5h: a failure sample whose From, To or Reply-To
|
|
header holds no address made the save index ``headers[...][0]`` of
|
|
mail-parser's empty list and raise ``IndexError``, which escaped the
|
|
CLI and stopped the mailbox run. The header is now left out of the
|
|
document and of the duplicate query."""
|
|
|
|
# An empty From: and Reply-To:, and To: undisclosed-recipients:; (an
|
|
# RFC 5322 §3.4 group with no members, which legitimate mail uses).
|
|
ARF = (
|
|
"From: dmarc@reporter.example\n"
|
|
"To: ruf@example.com\n"
|
|
"Date: Mon, 01 Jan 2024 00:00:00 +0000\n"
|
|
"Subject: DMARC Failure Report\n"
|
|
"MIME-Version: 1.0\n"
|
|
'Content-Type: multipart/report; report-type=feedback-report; boundary="b"\n'
|
|
"\n"
|
|
"--b\n"
|
|
"Content-Type: text/plain\n"
|
|
"\n"
|
|
"Authentication failure report.\n"
|
|
"--b\n"
|
|
"Content-Type: message/feedback-report\n"
|
|
"\n"
|
|
"Feedback-Type: auth-failure\n"
|
|
"User-Agent: test/1.0\n"
|
|
"Version: 1\n"
|
|
"Original-Mail-From: user@example.com\n"
|
|
"Arrival-Date: Mon, 01 Jan 2024 00:00:00 +0000\n"
|
|
"Source-IP: 192.0.2.1\n"
|
|
"Reported-Domain: example.com\n"
|
|
"Authentication-Results: mx; dmarc=fail\n"
|
|
"\n"
|
|
"--b\n"
|
|
"Content-Type: text/rfc822-headers\n"
|
|
"\n"
|
|
"From:\n"
|
|
"To: undisclosed-recipients:;\n"
|
|
"Reply-To:\n"
|
|
"Subject: spoofed\n"
|
|
"Date: Mon, 01 Jan 2024 00:00:00 +0000\n"
|
|
"--b--\n"
|
|
)
|
|
|
|
def test_empty_address_headers_are_left_out(self):
|
|
parsed = parse_report_email(self.ARF, offline=True)
|
|
self.assertEqual(parsed["report_type"], "failure")
|
|
report = cast(dict, parsed["report"])
|
|
headers = report["parsed_sample"]["headers"]
|
|
self.assertEqual(
|
|
(headers["From"], headers["To"], headers["Reply-To"]), ([], [], [])
|
|
)
|
|
search = _empty_search()
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=search),
|
|
patch("parsedmarc.elastic.Index"),
|
|
patch.object(
|
|
elastic_module._FailureReportDoc, "save", autospec=True
|
|
) as mock_save,
|
|
):
|
|
save_failure_report_to_elasticsearch(report)
|
|
doc = mock_save.call_args.args[0]
|
|
self.assertEqual(doc.sample.headers["subject"], "spoofed")
|
|
for header in ("from", "to", "reply-to"):
|
|
self.assertNotIn(header, doc.sample.headers)
|
|
query = json.dumps(search.query.to_dict())
|
|
self.assertIn("sample.headers.subject", query)
|
|
self.assertNotIn("sample.headers.from", query)
|
|
self.assertNotIn("sample.headers.to", query)
|
|
|
|
|
|
class TestAggregateAttributesDoNotReachTheDocument(unittest.TestCase):
|
|
"""GHSA-qpcg-29vr-jwm3: an XML attribute on a scalar element reached the
|
|
document as an object and mapped the field as one."""
|
|
|
|
def test_document_holds_no_object_for_attributed_fields(self):
|
|
attribute = ' a="1"'
|
|
xml = (
|
|
f"<feedback><version{attribute}>1.0</version><report_metadata>"
|
|
"<org_name>example.net</org_name><email>a@example.net</email>"
|
|
"<report_id>r</report_id><date_range><begin>1704067200</begin>"
|
|
"<end>1704153599</end></date_range></report_metadata>"
|
|
"<policy_published><domain>example.com</domain>"
|
|
f"<p{attribute}>none</p><fo{attribute}>1</fo></policy_published>"
|
|
"<record><row><source_ip>192.0.2.1</source_ip><count>1</count>"
|
|
f"<policy_evaluated><disposition{attribute}>none</disposition>"
|
|
"<dkim>pass</dkim><spf>pass</spf></policy_evaluated></row>"
|
|
"<identifiers><header_from>example.com</header_from>"
|
|
f"<envelope_to{attribute}>example.org</envelope_to></identifiers>"
|
|
"<auth_results><spf><domain>example.com</domain><result>pass</result>"
|
|
"</spf></auth_results></record></feedback>"
|
|
)
|
|
report = parse_aggregate_report_xml(xml, offline=True)
|
|
docs = []
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection"),
|
|
patch.object(
|
|
elastic_module._AggregateReportDoc,
|
|
"save",
|
|
autospec=True,
|
|
side_effect=lambda doc, *args, **kwargs: docs.append(doc.to_dict()),
|
|
),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_aggregate_report_to_elasticsearch(cast(dict, report))
|
|
doc = docs[0]
|
|
self.assertEqual(doc["xml_schema"], "1.0")
|
|
self.assertEqual(doc["disposition"], "none")
|
|
self.assertEqual(doc["envelope_to"], "example.org")
|
|
self.assertEqual(doc["published_policy"]["p"], "none")
|
|
self.assertEqual(doc["published_policy"]["fo"], "1")
|
|
|
|
|
|
# Every element of an aggregate report that the schema types as a string,
|
|
# with its plain value; {name} placeholders take a variant.
|
|
_SCALAR_FIELD_VALUES = {
|
|
"version": "1.0",
|
|
"org_name": "reporter.example",
|
|
"email": "dmarc@reporter.example",
|
|
"extra_contact_info": "https://reporter.example/dmarc",
|
|
"report_id": "scalar-test",
|
|
"generator": "reporter/1.0",
|
|
"domain": "example.com",
|
|
"adkim": "r",
|
|
"aspf": "s",
|
|
"p": "none",
|
|
"sp": "quarantine",
|
|
"pct": "100",
|
|
"fo": "1",
|
|
"np": "reject",
|
|
"testing": "n",
|
|
"discovery_method": "psl",
|
|
"source_ip": "192.0.2.1",
|
|
"count": "3",
|
|
"disposition": "none",
|
|
"dkim": "pass",
|
|
"spf": "fail",
|
|
"header_from": "example.com",
|
|
"envelope_from": "bounce.example.com",
|
|
"envelope_to": "example.org",
|
|
"dkim_domain": "example.com",
|
|
"selector": "s1",
|
|
"dkim_result": "pass",
|
|
"dkim_human_result": "good signature",
|
|
"spf_domain": "bounce.example.com",
|
|
"scope": "mfrom",
|
|
"spf_result": "fail",
|
|
"spf_human_result": "not listed",
|
|
}
|
|
_SCALAR_FIELD_TEMPLATE = (
|
|
"<feedback><version>{version}</version><report_metadata>"
|
|
"<org_name>{org_name}</org_name><email>{email}</email>"
|
|
"<extra_contact_info>{extra_contact_info}</extra_contact_info>"
|
|
"<report_id>{report_id}</report_id><generator>{generator}</generator>"
|
|
"<date_range><begin>1704067200</begin><end>1704153599</end></date_range>"
|
|
"</report_metadata><policy_published><domain>{domain}</domain>"
|
|
"<adkim>{adkim}</adkim><aspf>{aspf}</aspf><p>{p}</p><sp>{sp}</sp>"
|
|
"<pct>{pct}</pct><fo>{fo}</fo><np>{np}</np><testing>{testing}</testing>"
|
|
"<discovery_method>{discovery_method}</discovery_method></policy_published>"
|
|
"<record><row><source_ip>{source_ip}</source_ip><count>{count}</count>"
|
|
"<policy_evaluated><disposition>{disposition}</disposition>"
|
|
"<dkim>{dkim}</dkim><spf>{spf}</spf>"
|
|
"<reason><type>other</type><comment>c</comment></reason>"
|
|
"</policy_evaluated></row><identifiers><header_from>{header_from}</header_from>"
|
|
"<envelope_from>{envelope_from}</envelope_from>"
|
|
"<envelope_to>{envelope_to}</envelope_to></identifiers><auth_results>"
|
|
"<dkim><domain>{dkim_domain}</domain><selector>{selector}</selector>"
|
|
"<result>{dkim_result}</result><human_result>{dkim_human_result}</human_result>"
|
|
"</dkim><spf><domain>{spf_domain}</domain><scope>{scope}</scope>"
|
|
"<result>{spf_result}</result><human_result>{spf_human_result}</human_result>"
|
|
"</spf></auth_results></record></feedback>"
|
|
)
|
|
|
|
|
|
def _scalar_field_xml(**variants: str) -> str:
|
|
"""The report with each named field's value replaced by its variant."""
|
|
return _SCALAR_FIELD_TEMPLATE.format(**{**_SCALAR_FIELD_VALUES, **variants})
|
|
|
|
|
|
# Fields whose element can hold child elements without the report being
|
|
# rejected.
|
|
_OPTIONAL_SCALAR_FIELDS = tuple(
|
|
name
|
|
for name in _SCALAR_FIELD_VALUES
|
|
if name
|
|
not in (
|
|
"org_name",
|
|
"report_id",
|
|
"domain",
|
|
"p",
|
|
"source_ip",
|
|
"count",
|
|
"header_from",
|
|
"dkim_domain",
|
|
"spf_domain",
|
|
)
|
|
)
|
|
|
|
|
|
# The fields of an aggregate report document that hold objects or lists;
|
|
# "[]" stands for a list item. Every other field must be a scalar.
|
|
_AGGREGATE_DOC_CONTAINERS = {
|
|
"date_range",
|
|
"published_policy",
|
|
"policy_overrides",
|
|
"policy_overrides[]",
|
|
"dkim_results",
|
|
"dkim_results[]",
|
|
"dkim_results_combined",
|
|
"spf_results",
|
|
"spf_results[]",
|
|
"spf_results_combined",
|
|
"errors",
|
|
}
|
|
|
|
|
|
def _container_paths(value, path=""):
|
|
"""Yield the path of every dict and list inside ``value``."""
|
|
if isinstance(value, dict):
|
|
if path:
|
|
yield path
|
|
for key, item in value.items():
|
|
yield from _container_paths(item, f"{path}.{key}" if path else key)
|
|
elif isinstance(value, list):
|
|
yield path
|
|
for item in value:
|
|
yield from _container_paths(item, f"{path}[]")
|
|
|
|
|
|
# A second <policy_published> makes the field a list; the first one's <p>
|
|
# holds a child element.
|
|
_REPEATED_POLICY_VARIANTS = {
|
|
"p": "<x>1</x>",
|
|
"discovery_method": (
|
|
"psl</discovery_method></policy_published><policy_published>"
|
|
"<domain>example.com</domain><p>none</p><discovery_method>psl"
|
|
),
|
|
}
|
|
|
|
|
|
class TestAggregateScalarFieldsReachTheDocumentAsScalars(unittest.TestCase):
|
|
"""GHSA-qpcg-29vr-jwm3: a child element under a field the schema types
|
|
as a string reached the document as an object and mapped the field as
|
|
one. The walk covers every field, so a scalar field added later is
|
|
checked too."""
|
|
|
|
def _document(self, **variants):
|
|
report = parse_aggregate_report_xml(_scalar_field_xml(**variants), offline=True)
|
|
docs = []
|
|
with (
|
|
patch("parsedmarc.elastic.Search", return_value=_empty_search()),
|
|
patch("parsedmarc.elastic.Index") as mock_index_cls,
|
|
patch("parsedmarc.elastic.connections.get_connection"),
|
|
patch.object(
|
|
elastic_module._AggregateReportDoc,
|
|
"save",
|
|
autospec=True,
|
|
side_effect=lambda doc, *args, **kwargs: docs.append(doc.to_dict()),
|
|
),
|
|
):
|
|
mock_index_cls.return_value.exists.return_value = False
|
|
save_aggregate_report_to_elasticsearch(cast(dict, report))
|
|
return docs[0]
|
|
|
|
def test_no_object_outside_the_object_fields(self):
|
|
mixed = {name: f"{value}<x/>" for name, value in _SCALAR_FIELD_VALUES.items()}
|
|
child = {name: "<x>1</x>" for name in _OPTIONAL_SCALAR_FIELDS}
|
|
for label, variants in (
|
|
("mixed", mixed),
|
|
("child", child),
|
|
("repeated policy_published", _REPEATED_POLICY_VARIANTS),
|
|
):
|
|
paths = set(_container_paths(self._document(**variants)))
|
|
self.assertIn("published_policy", paths, msg=label)
|
|
self.assertLessEqual(paths, _AGGREGATE_DOC_CONTAINERS, msg=label)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(verbosity=2)
|