refactor: daemon collectors, thin webui proxies, pure config reads
- move state collectors from lib/state.py to daemon/collectors/ (7 modules, registration side-effect; daemon/server.py imports the package before the first populate()) - webui/api: new daemon_route() decorator factory in common.py collapses the try/except daemon-proxy boilerplate in all 8 blueprints (rules/params/body/transform keep responses identical) - firewall: interface-coverage invariant — config is the source of truth for zone interfaces (absent key = empty, no hands-off zones); pure validate_coverage() enforced at save (400) and apply (409, force: true overrides), top-level `unmanaged` exemption - lib: get_config() reads are now pure (no dir creation or writes); new lib/bootstrap.py creates runtime dirs and persists the one-shot nginx legacy migration at daemon start, after system_import (lib.nginx.migrate_config_file) - lib/common: compute_pending() apply-bookkeeping helper - daemon: emit_and_refresh() handler helper; refresh_state(bump=) so /status/refresh no longer bumps versions (poll/mutation only) - acme: move --log last so acme.sh never treats a real arg as the log-file argument - docs: AGENTS.md, config.md, state-model.md, api.md updated; HARDEN.md dropped (plan implemented); apply-confirm force wording Tests: 917 passed; ruff check + format clean.
This commit is contained in:
@@ -58,6 +58,20 @@ class TestRunAcme:
|
||||
assert cmd[0] == "/usr/local/bin/acme.sh"
|
||||
assert "sudo" not in cmd
|
||||
|
||||
@patch("lib.acme._find_acme")
|
||||
@patch("lib.acme.subprocess.run")
|
||||
def test_log_flag_is_last(self, mock_run, mock_find):
|
||||
# --log must trail the subcommand args: acme.sh would otherwise
|
||||
# consume the first subcommand arg as its (optional) file argument.
|
||||
mock_find.return_value = "/usr/local/bin/acme.sh"
|
||||
mock_run.return_value = MagicMock(returncode=0, stdout="", stderr="")
|
||||
acme._run_acme(["--issue", "-d", "example.com"])
|
||||
cmd = mock_run.call_args[0][0]
|
||||
assert cmd.count("--log") == 1
|
||||
assert cmd[-1] == "--log"
|
||||
assert cmd.index("--issue") < cmd.index("--log")
|
||||
assert "example.com" in cmd
|
||||
|
||||
|
||||
class TestParseListOutput:
|
||||
def test_parses_single_entry(self):
|
||||
|
||||
Reference in New Issue
Block a user