mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-11 01:14:45 +02:00
K7ZVX
a491684861
Fixes the two real bugs C.3 surfaced when flipping usgs_quake to central. BUG #1 -- GUI save dropped ${VAR} secret refs (config_loader.save_section). before: A GUI PUT round-trips the *interpolated* secret value (GET returns the resolved key string, e.g. the real TomTom key). save_section's check_secrets saw a literal string at a SECRET_FIELDS path, didn't recognize it as a ref, and DROPPED it -- losing the on-disk ${TOMTOM_API_KEY} placeholder. C.3's flip PUT stripped TomTom's key. after: check_secrets now reads the raw on-disk value (pre-interpolation) for each secret field and decides three ways: on-disk ${VAR} and new == resolved(VAR) -> keep the ${VAR} ref on-disk ${VAR} and new != resolved(VAR) -> intentional change, store it no on-disk ${VAR} ref -> reject (never write a raw secret to a domain file) ${VAR} resolution mirrors load: os.environ first, then /data/secrets/.env. The common case (GUI re-saves unchanged config) now preserves the placeholder instead of dropping it. BUG #2 -- CentralConsumer replayed the entire retained backlog on first flip. before: js.subscribe(...) with no config -> default deliver_policy=all. Fine for quake (682 msgs) but would flood the bus with ~330k traffic_flow messages on first flip. after: consumer_config() -> ConsumerConfig(deliver_policy=DeliverPolicy.NEW): only messages published AFTER consumer creation. meshai won't see the backlog on first flip -- acceptable, Central is a live firehose for current events. (NOT geo-filtering -- that's a Central-side issue filed separately for the Central project.) Files: meshai/config_loader.py (save_section secret preservation), meshai/central/consumer.py (consumer_config() + deliver_policy=NEW), tests/test_save_section_secret_preserve.py (new), tests/test_central_consumer.py (deliver_policy assertion). Verification: - (A) py_compile clean on config_loader.py + consumer.py. - (C) pytest -q: 276 passed (272 + 4 new -- preserve-unchanged-ref, changed-value-written, no-placeholder-still-rejects, deliver_policy=NEW). The C.2.1 strip test still passes (no placeholder -> reject). - (D) In-prod (rebuilt): GET+PUT /api/config/environmental round-trip -> {"saved":true}; on-disk traffic.api_key stayed '${TOMTOM_API_KEY}' (SECRET_REF_PRESERVED: True), not the literal key; disk restored to baseline. consumer_config().deliver_policy == DeliverPolicy.NEW in the built image. Follow-up for D rollout: the durable 'meshai-v04-central_quake_' created during C.3 was made with deliver_policy=all; re-flipping a domain may need that stale durable deleted on the Central NATS server first (config mismatch on re-subscribe). D rollout (remaining domains) is now safe: GUI flips preserve secret refs and new subscriptions don't replay huge backlogs. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
57 lines
2.2 KiB
Python
57 lines
2.2 KiB
Python
"""v0.4 C.3.1: save_section preserves on-disk ${VAR} secret refs instead of
|
|
dropping them when a GUI save round-trips the interpolated value."""
|
|
|
|
import yaml
|
|
|
|
from meshai.config_loader import save_section
|
|
|
|
|
|
def _setup(tmp_path, env_yaml, dotenv):
|
|
cfg = tmp_path / "config"
|
|
cfg.mkdir()
|
|
sec = tmp_path / "secrets"
|
|
sec.mkdir()
|
|
(cfg / "env_feeds.yaml").write_text(env_yaml)
|
|
(sec / ".env").write_text(dotenv)
|
|
return cfg
|
|
|
|
|
|
def test_preserves_unchanged_secret_ref(tmp_path):
|
|
# on-disk has ${C31_TEST_KEY}; GUI submits the resolved value -> keep the ref
|
|
cfg = _setup(
|
|
tmp_path,
|
|
"enabled: true\ntraffic:\n enabled: true\n api_key: ${C31_TEST_KEY}\n",
|
|
"C31_TEST_KEY=realkey123\n",
|
|
)
|
|
res = save_section("environmental",
|
|
{"enabled": True, "traffic": {"enabled": True, "api_key": "realkey123"}},
|
|
cfg)
|
|
written = yaml.safe_load((cfg / "env_feeds.yaml").read_text())
|
|
assert written["traffic"]["api_key"] == "${C31_TEST_KEY}" # placeholder preserved
|
|
assert "traffic.api_key" not in res["rejected_secrets"]
|
|
|
|
|
|
def test_changed_secret_value_is_written(tmp_path):
|
|
# on-disk ${C31_TEST_KEY}; GUI submits a DIFFERENT value -> intentional change stored
|
|
cfg = _setup(
|
|
tmp_path,
|
|
"enabled: true\ntraffic:\n enabled: true\n api_key: ${C31_TEST_KEY}\n",
|
|
"C31_TEST_KEY=oldkey\n",
|
|
)
|
|
save_section("environmental",
|
|
{"enabled": True, "traffic": {"enabled": True, "api_key": "NEWKEY999"}},
|
|
cfg)
|
|
written = yaml.safe_load((cfg / "env_feeds.yaml").read_text())
|
|
assert written["traffic"]["api_key"] == "NEWKEY999"
|
|
|
|
|
|
def test_no_placeholder_still_rejects(tmp_path):
|
|
# no on-disk ${VAR} ref -> a raw secret must be rejected, never written
|
|
cfg = tmp_path / "config"
|
|
cfg.mkdir()
|
|
res = save_section("environmental",
|
|
{"enabled": True, "traffic": {"enabled": True, "api_key": "RAWSECRET"}},
|
|
cfg)
|
|
written = yaml.safe_load((cfg / "env_feeds.yaml").read_text())
|
|
assert "api_key" not in written.get("traffic", {})
|
|
assert "traffic.api_key" in res["rejected_secrets"]
|