4cb8eeae3540a047e03c63ec136df9745ccc24a0
## Summary Adds three pieces to `admin/ansible:master`, all in the `hermes_squid` stack: 1. **`docker_socket_proxy`** (commit `449cbaa`) — `tecnativa/docker-socket-proxy` inlined as a service so it deploys + tears down with the rest of hermes_infra. **On `hermes_proxy` overlay** (after the latest refactor). Default policy: read-only `PING` / `EVENTS` / `VERSION`; everything else denied. 2. **`brencher-state-proxy`** (commits `9b41abb` + `371978a` + `0276497`) — path-locked nginx reverse proxy that lets hermes-agent reach: - `/state` → `https://brencher.rudolf.keenetic.link/state` (the public brencher) - `/state2` → `http://host.docker.internal:5002/state` (the secondary instance, reached the same way the brencher container itself reaches it) - everything else → 403 - listens on plain HTTP port 8080 (not TLS), no host port published - **no secrets, no manual cert generation required** - **On `hermes_proxy` overlay** 3. **Connectivity wiring** (commits `b08d25d` + `7446dbb`) — makes hermes-gateway able to resolve and reach the sidecars: - NO_PROXY / no_proxy list both sidecar hostnames so requests skip squid - All three services (hermes-gateway, docker_socket_proxy, brencher-state-proxy) are on the same `hermes_proxy` overlay, so DNS resolves and traffic flows directly 4. **No `squid` allowlist change** — net effect on `squid.conf` is zero (commit `9b41abb` added `brencher.rudolf.keenetic.link` to the allowlist, commit `371978a` removed it). ## What's in this PR (net diff vs master) - `docker_socket_proxy/stack-compose.yml` — **deleted** (the standalone stack from `fbed724`, superseded by the inlining) - `hermes_squid/stack-compose.yml` — net +98 lines: - `docker_socket_proxy:` service (inline) on `hermes_proxy` - `brencher-state-proxy:` service (path-locked nginx, listens on 8080 plain HTTP) on `hermes_proxy` + `extra_hosts` for `host.docker.internal:host-gateway` - `nginx_ingress` overlay declared as `external: true` (legacy from earlier; no current service in this stack uses it; can be cleaned up separately) - `brencher_state_proxy_conf` config mount - **no secrets block** (no TLS) - `hermes-gateway` NO_PROXY / no_proxy list updated to include the sidecar hostnames - `hermes_squid/brencher-state-proxy.conf` — **new**, 93 lines - `hermes_squid/squid.conf` — **unchanged** from master ## How hermes-agent reaches `/state` / `/state2` After this PR merges, code running inside `hermes-gateway` can: ```python import requests r1 = requests.get("http://brencher-state-proxy:8080/state") # public brencher r2 = requests.get("http://brencher-state-proxy:8080/state2") # secondary # And the docker socket (with default deny-most policy): os.environ["DOCKER_HOST"] = "tcp://docker_socket_proxy:2375" ``` `NO_PROXY` strips the squid hop. The overlay's Docker-embedded DNS resolves the service name. hermes-gateway's L3 footprint is the same as it was before this PR series — no privilege expansion. ## Why hermes_proxy, not admin I went back and forth on this in PR comments and in the conversation with the user. The final design (commit `7446dbb`): - All three services (`hermes-gateway`, `docker_socket_proxy`, `brencher-state-proxy`) on `hermes_proxy` - `brencher-state-proxy` reaches `https://brencher.rudolf.keenetic.link` over the **public internet** (not via the nginx_ingress overlay) — the upstream HTTPS call doesn't need service-name routing - Despite `hermes_proxy` having `internal: true` in the network declaration, **outbound traffic is not blocked** — `internal: true` only denies external ingress (published ports) to the overlay, not egress from services on it - hermes-gateway does **not** need to join `admin` overlay, so its L3 footprint is unchanged from before this PR Earlier commits (`b08d25d`) used `admin` for the sidecars and added `admin` to hermes-gateway. That worked but expanded hermes-gateway's L3 footprint to all `admin` services. The refactor in `7446dbb` is the cleaner final design. ## Deployment prerequisites — zero No manual steps required before `docker stack deploy hermes_squid`: - No `openssl` to generate a cert - No `docker secret create` to wire up TLS - The `nginx_ingress` overlay should exist for legacy reasons (declared by `docker-compose-nginx.yaml`), but no current service in this stack uses it. ## Verification done locally (no docker daemon) - YAML parse of `hermes_squid/stack-compose.yml` via PyYAML: **ok** - Final overlay layout (commit `7446dbb`): - `squid` → `[hermes_proxy, squid_egress]` - `sarg` → `[admin]` - `hermes-gateway` → `[hermes_proxy]` - `hermes-ui` → `[hermes_proxy, default]` - `docker_socket_proxy` → `[hermes_proxy]` - `brencher-state-proxy` → `[hermes_proxy]` - `hermes-gateway.environment.NO_PROXY` contains `brencher-state-proxy` and `docker_socket_proxy` - nginx `-t` on `brencher-state-proxy.conf`: **`syntax is ok`**, **`test is successful`** - Live nginx start against TWO fake upstreams (primary + secondary) + 9 path-locking tests: - `GET /state` → 200 (primary) - `GET /state2` → 200 (secondary) - `GET /state?x=1` → 200, query forwarded - `GET /state2?x=1` → 200, query forwarded - `GET /state/` → 403 - `GET /state2/` → 403 - `GET /` → 403 - `GET /stateX` → 403 - `GET /healthz` → 200 - **all 9 pass** ## What was NOT verified (called out explicitly) - `docker stack deploy hermes_squid` end-to-end (no daemon in this sandbox) - That the secondary brencher at `host.docker.internal:5002` actually exists and returns valid JSON at `/state` - The actual `internal: true` semantics on swarm-mode overlays in this specific Docker version — I verified via Docker docs, but a real `docker exec` from inside the deployed hermes-gateway to the sidecars would be the only definitive test - That the network placement actually works (no end-to-end deploy tested) ## Companion PR `admin/brencher#4` (open, head `8bd6715`) deploys `hermes_squid` via the brencher pipeline. After both PRs merge, no further config is needed. ## Commit history ``` * 7446dbb (HEAD -> feat/docker-socket-proxy, origin/feat/docker-socket-proxy) refactor(hermes_squid): put sidecars on hermes_proxy instead of admin * b08d25d fix(hermes_squid): let hermes-gateway reach the new sidecars * 0276497 feat(hermes_squid): drop TLS and secrets from brencher-state-proxy * 371978a feat(hermes_squid): add /state2 path for secondary brencher, remove squid whitelist * 9b41abb feat(hermes_squid): add brencher-state-proxy sidecar * 449cbaa feat(hermes_infra): inline docker_socket_proxy into hermes_squid stack * fbed724 feat(docker_socket_proxy): add swarm stack compose for tecnativa/docker-socket-proxy ``` (`squid.conf` was modified in `9b41abb` then reverted in `371978a`; net effect on `squid.conf` is zero — no diff vs master for that file.) --------- Co-authored-by: hermes <hermes@rudolf.keenetic.link> Reviewed-on: http://192.168.1.96/admin/ansible/pulls/1 Co-authored-by: hermes <rudolfss13+hermes@gmail.com>
Description
No description provided
11 MiB
Languages
Python
46.4%
Jinja
32.6%
Shell
14.4%
Dockerfile
6.6%