mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 19:56:53 +00:00
Resolves 68 conflicted files. The governing rule was our structure with their
network semantics: the tor boolean becomes a network mode (clearnet | tor |
multi) throughout the variant layer, while this branch's architecture and mesh
axes, its extracted modules and its i18n content stay.
Where the two sides covered different ground, both are kept rather than one
picked:
- ca_injected answers a ca_client on the deployment's TLS mode OR on an SSO
issuer that resolves self-signed. 3a3e9ed2c9 records why: an issuer is not
an object store, so keeping only one side drops the other's coverage.
- get_merged_domains keeps the loud refusal when svc-net-tor is deployed
without a provisioned node, now gated on their tor_serves_host; their
node_onion_of returns an empty string there, which would have served every
onion-exclusive app on clearnet in silence.
- sso_cookie_domains stays the single source for oauth2-proxy's cookie scope.
Their per-network branch omitted the issuer domain on the onion arm, which
breaks the callback leg.
- The clearnet CSP batch carries --clearnet-timeout again; their batch dict
hardcoded zero while the role still passes the flag.
- The dashboard keeps its i18n content dir, image, version and design
resolution; their side reduced the logo sources to the bare service
provider values.
Their side wins where it is measurably better: the onion mirror rewrite is
gated per vhost rather than per app, the Playwright onion decision reads the
pass's own domain instead of the role's canonical one, and the matomo
reinjection and dashboard config render per network sibling.
Eight files were broken by the merge without ever carrying a conflict marker,
because git marks only the lines both sides touched:
- utils/cache/domains.py lost the onionize block that sat between two hunks
- roles/sys-front-inj-all/templates/body_filter.lua.j2 called it
- web-app-bluesky, keycloak sso_proxy: the get_entity_name filter was renamed
- trigger/__main__.py, playwright_coverage.py and its test: the deleted tor
module
- cli/administration/deploy/ci/timings.py read Label.tor
- plugins/filter/csp_filters.py called _aligned_url with four of six arguments
- tests/unit/python/utils/cache/test_domains.py referenced a renamed class
- tests/.../sys-ctl-hlth-csp/files/test_script.py mocked a function main no
longer calls
Verified: the variant layer (155 tests, 65 subtests), ca_injected (18),
the CI layer (175), the domains cache including the restored guard (32),
retrigger inputs (9), timings and the CSP health script (53). make
quality-high clears autoformat; its remaining findings are tracked separately.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
168 lines
5.8 KiB
Python
168 lines
5.8 KiB
Python
"""Unit tests for the smtp_host lookup plugin.
|
|
|
|
Pins the SMTP endpoint matrix msmtp relays through: the configured relay in
|
|
production, loopback on a host that carries the stack, and the swarm manager's
|
|
routing mesh on a bare infra node inside the containerised test rig.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib.util
|
|
import unittest
|
|
|
|
from ansible.errors import AnsibleError
|
|
|
|
from utils.domains.default_primary import default_domain_primary
|
|
|
|
from . import PROJECT_ROOT
|
|
|
|
DOMAIN = default_domain_primary()
|
|
RELAY = f"mail.{DOMAIN}"
|
|
MANAGER = "swarm-manager-01"
|
|
|
|
|
|
def _load_lookup():
|
|
spec = importlib.util.spec_from_file_location(
|
|
"lookup_smtp_host",
|
|
str(PROJECT_ROOT / "plugins/lookup/smtp_host.py"),
|
|
)
|
|
mod = importlib.util.module_from_spec(spec)
|
|
assert spec and spec.loader
|
|
spec.loader.exec_module(mod)
|
|
return mod.LookupModule
|
|
|
|
|
|
class _DummyTemplar:
|
|
def __init__(self, available_variables=None):
|
|
self.available_variables = available_variables or {}
|
|
|
|
def template(self, value):
|
|
return value
|
|
|
|
|
|
class _RenderingTemplar:
|
|
"""A templar that actually resolves expressions, like the real one.
|
|
|
|
``_DummyTemplar`` returns its input unchanged, so it cannot expose a value
|
|
that only misbehaves while still an unrendered template.
|
|
"""
|
|
|
|
def __init__(self, available_variables=None, rendered=None):
|
|
self.available_variables = available_variables or {}
|
|
self._rendered = rendered or {}
|
|
|
|
def template(self, value):
|
|
return self._rendered.get(value, value)
|
|
|
|
|
|
def _email(external=True, host=RELAY):
|
|
return {"external": external, "host": host}
|
|
|
|
|
|
class TestSmtpHostLookup(unittest.TestCase):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
cls.LookupModule = _load_lookup()
|
|
|
|
def _resolve(self, variables, email=None):
|
|
lm = self.LookupModule()
|
|
lm._templar = _DummyTemplar(variables)
|
|
lm._loader = None
|
|
return lm.run([email if email is not None else _email()], variables=variables)[
|
|
0
|
|
]
|
|
|
|
def test_production_keeps_the_configured_relay(self):
|
|
vars_ = {"DOCKER_IN_CONTAINER": False, "DEPLOYMENT_MODE": "swarm"}
|
|
self.assertEqual(self._resolve(vars_), RELAY)
|
|
|
|
def test_non_external_mail_keeps_the_configured_relay(self):
|
|
vars_ = {"DOCKER_IN_CONTAINER": True, "DEPLOYMENT_MODE": "swarm"}
|
|
email = _email(external=False, host="localhost")
|
|
self.assertEqual(self._resolve(vars_, email), "localhost")
|
|
|
|
def test_compose_rig_uses_loopback(self):
|
|
vars_ = {"DOCKER_IN_CONTAINER": True, "DEPLOYMENT_MODE": "compose"}
|
|
self.assertEqual(self._resolve(vars_), "127.0.0.1")
|
|
|
|
def test_an_unrendered_group_var_still_reaches_the_rig_loopback(self):
|
|
"""DOCKER_IN_CONTAINER is a group_vars expression, and a lookup receives it
|
|
raw. Read unrendered it is neither true nor false, so the rig kept the
|
|
configured relay instead of loopback — and on an onion node that relay is a
|
|
.onion, which msmtp cannot route (EX_UNAVAILABLE, 'proxy failure')."""
|
|
raw = "{{ (ansible_facts['env']['container'] | default('')) != '' }}"
|
|
vars_ = {"DOCKER_IN_CONTAINER": raw, "DEPLOYMENT_MODE": "compose"}
|
|
lm = self.LookupModule()
|
|
lm._templar = _RenderingTemplar(vars_, {raw: True})
|
|
lm._loader = None
|
|
self.assertEqual(lm.run([_email()], variables=vars_)[0], "127.0.0.1")
|
|
|
|
def test_swarm_node_uses_loopback(self):
|
|
vars_ = {
|
|
"DOCKER_IN_CONTAINER": True,
|
|
"DEPLOYMENT_MODE": "swarm",
|
|
"IS_COMPOSE_MODE": False,
|
|
"IS_SWARM_MODE": True,
|
|
"group_names": ["svc-swarm-node"],
|
|
}
|
|
self.assertEqual(self._resolve(vars_), "127.0.0.1")
|
|
|
|
def test_infra_node_enters_through_the_manager(self):
|
|
vars_ = {
|
|
"DOCKER_IN_CONTAINER": True,
|
|
"DEPLOYMENT_MODE": "swarm",
|
|
"IS_COMPOSE_MODE": False,
|
|
"IS_SWARM_MODE": True,
|
|
"group_names": ["svc-nfs-server"],
|
|
"groups": {"svc-swarm-manager": [MANAGER, "swarm-manager-02"]},
|
|
}
|
|
self.assertEqual(self._resolve(vars_), MANAGER)
|
|
|
|
def test_infra_node_without_manager_falls_back_to_the_relay(self):
|
|
vars_ = {
|
|
"DOCKER_IN_CONTAINER": True,
|
|
"DEPLOYMENT_MODE": "swarm",
|
|
"IS_COMPOSE_MODE": False,
|
|
"IS_SWARM_MODE": True,
|
|
"group_names": ["svc-nfs-server"],
|
|
"groups": {"svc-swarm-manager": []},
|
|
}
|
|
self.assertEqual(self._resolve(vars_), RELAY)
|
|
|
|
def test_string_booleans_are_coerced(self):
|
|
vars_ = {"DOCKER_IN_CONTAINER": "True", "DEPLOYMENT_MODE": "compose"}
|
|
self.assertEqual(self._resolve(vars_, _email(external="yes")), "127.0.0.1")
|
|
|
|
def test_swarm_node_wins_over_a_populated_manager_group(self):
|
|
vars_ = {
|
|
"DOCKER_IN_CONTAINER": True,
|
|
"DEPLOYMENT_MODE": "swarm",
|
|
"IS_COMPOSE_MODE": False,
|
|
"IS_SWARM_MODE": True,
|
|
"group_names": ["svc-swarm-node"],
|
|
"groups": {"svc-swarm-manager": [MANAGER]},
|
|
}
|
|
self.assertEqual(self._resolve(vars_), "127.0.0.1")
|
|
|
|
def test_missing_terms_raise(self):
|
|
lm = self.LookupModule()
|
|
lm._templar = _DummyTemplar({})
|
|
with self.assertRaises(AnsibleError):
|
|
lm.run([], variables={})
|
|
|
|
def test_too_many_terms_raise(self):
|
|
lm = self.LookupModule()
|
|
lm._templar = _DummyTemplar({})
|
|
with self.assertRaises(AnsibleError):
|
|
lm.run([_email(), _email()], variables={})
|
|
|
|
def test_non_mapping_term_raises(self):
|
|
lm = self.LookupModule()
|
|
lm._templar = _DummyTemplar({})
|
|
with self.assertRaises(AnsibleError):
|
|
lm.run([RELAY], variables={})
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(verbosity=2)
|