fix: ACME ownership self-heal + daily timer, apply-all force, firewall baseline re-stamp
acme:
- acme.sh chmods its tree to owner-only (700/600) every run, which
broke the two-user model: a tree left owner-only by one user made
every acme.sh call of the other exit 2
- normalize_acme_home() reopens group access (sudo chmod g+rwX,
files only — setgid dirs trip RestrictSUIDSGID); _run_acme_preflight
is the choke point before every daemon acme.sh call + startup
- acme service now runs as the daemon user; --log persists the raw CA
transcript; SYS_LOG=6 journals manual issue/renew runs
- timer daily-only: two runs/day landed inside ZeroSSL's 24h
validation backoff (Retry-After: 86400) — a permanent renewal lockout
- _collect_acme no longer raises on cert-list failure; reports
status.error (AcmeState.status) so the certs page can surface it
firewall: re-stamp the applied baseline on live zone mutations
(interfaces/services/rich-rules/masquerade/forward-ports) so cancel-all
reverts to post-mutation state, not a stale install-era snapshot;
set_masquerade syncs the declarative config for existing zones;
add_forward_port records toaddr only with toport
status: apply-all accepts {"force": true} (forwarded to the firewall
apply only); ApplyConfirm force checkbox; applyResultToasts() — the
errors map wins over the 200; ActionButton checks errors before the
success toast; dashboard uses ApplyConfirm
system_import: drift re-imports carry the existing apply-meta; first
import stamps the adopted content as applied (it is the running state)
— no phantom pending changes
nginx: get_config only re-saves when migration actually changed the
config (no more owner/mtime churn on every read)
install: repair mis-owned top-level system dirs (tmpfiles
unsafe-path-transition), warn with a full-repair command for deeper
mis-ownership
daemon/server: loop.get_exception_handler() (aiohttp API fix)
tests: 888 pytest + 24 node passing; ruff clean
This commit is contained in:
@@ -55,6 +55,30 @@ class TestGetConfig:
|
||||
assert "ssl" in cfg
|
||||
assert cfg["domains"] == {}
|
||||
|
||||
def test_read_does_not_rewrite_unchanged_file(self, temp_data_dir):
|
||||
"""get_config() must not re-save a file that needs no migration."""
|
||||
nginx.save_config(
|
||||
{
|
||||
"backends": {"webui": {"_migrated": True, "paths": {}}},
|
||||
"domains": {"app.example.com": {"backend": "webui"}},
|
||||
"ssl": {"protocols": "TLSv1.3"},
|
||||
}
|
||||
)
|
||||
mtime_before = nginx.CONFIG_FILE.stat().st_mtime_ns
|
||||
cfg = nginx.get_config()
|
||||
assert cfg["domains"] == {"app.example.com": {"backend": "webui"}}
|
||||
# No churn: reading a current-format config leaves the file alone.
|
||||
assert nginx.CONFIG_FILE.stat().st_mtime_ns == mtime_before
|
||||
|
||||
def test_read_saves_when_migration_applied(self, temp_data_dir):
|
||||
"""get_config() persists the file when migration actually changes it."""
|
||||
nginx.save_config({"domains": {"app.example.com": {"backend": "myapp"}}})
|
||||
mtime_before = nginx.CONFIG_FILE.stat().st_mtime_ns
|
||||
cfg = nginx.get_config()
|
||||
# Migration added the builtin webui backend.
|
||||
assert cfg["backends"]["webui"]["_migrated"] is True
|
||||
assert nginx.CONFIG_FILE.stat().st_mtime_ns != mtime_before
|
||||
|
||||
|
||||
class TestSaveConfig:
|
||||
def test_saves_and_reloads(self, temp_data_dir):
|
||||
|
||||
Reference in New Issue
Block a user