fix(squid): write explicitly-passed values through to .env on a re-run
.env was seeded only when absent, so a re-run with a corrected value logged
".env exists; leaving it alone" and dropped it. That looked harmless because
compose reads the shell environment before .env: an exported BIND_ADDR did
narrow the bind for that run, `ss -ltn` confirmed it, and the deploy reported
success -- while .env still said 0.0.0.0.
The drift surfaces later. The documented update path is a plain
`docker compose up -d`, which has no such environment, falls back to .env, and
republishes an SSL-bumping intercepting proxy on every interface. Nothing
warned. TRUSTED_CIDR has the same shape: a tightened allow-list silently
reverts to whatever .env kept.
Record which runtime keys actually arrived in the environment BEFORE the ":="
defaults run -- PROXY_PORT especially, whose default is a non-empty 3128, so
afterwards an unset variable is indistinguishable from a supplied one. On a
re-run, write just those keys through with the existing set_env() (a targeted
per-key rewrite, not a file overwrite) and log each change. Keys not passed
that run are untouched, so hand-edits to .env survive.
Verified: narrowing BIND_ADDR updates .env and logs it; a re-run with nothing
exported leaves .env alone; re-passing identical values is a silent no-op; and
a hand-edited PROXY_PORT=8080 survives all three, which is what the
capture-before-defaults ordering exists for.
Found by an adversarial sweep for the openbao bug class (920edc5), then
confirmed by hand.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
bf52426299
commit
4643b77083
2 files changed
+39
-2
No files matched your search
@@ -44,6 +44,15 @@ The deploy is idempotent. On first run it builds the local image, generates the
|
||||
CA into `ssl/` (never overwritten), seeds `.env`, registers the port with the
|
||||
host firewall if present, and brings the stack up.
|
||||
|
||||
On a **re-run**, an existing `.env` is kept — except for values you pass
|
||||
explicitly that run (`TRUSTED_CIDR`, `BIND_ADDR`, `PROXY_PORT`, `CACHE_SIZE_MB`,
|
||||
`CACHE_ONLY_LISTED`), which are written through and logged. That matters because
|
||||
Compose reads the shell environment *before* `.env`: without the write-through, a
|
||||
re-run that narrowed `BIND_ADDR` would apply only to that run, and the next plain
|
||||
`docker compose up -d` — which has no such environment — would fall back to the
|
||||
old `.env` and republish the intercepting proxy on `0.0.0.0`. Values you do not
|
||||
pass are left untouched, so hand-edits to `.env` survive.
|
||||
|
||||
## Point clients at it
|
||||
|
||||
```bash
|
||||
|
||||
Reference in new issue
Block a user