didericis
d62d19a2e7
tracker-policy-pr / check-pr (pull_request) Successful in 6s
test / integration-docker (pull_request) Successful in 13s
test / unit (pull_request) Failing after 37s
lint / lint (push) Successful in 57s
test / integration-firecracker (pull_request) Successful in 3m19s
test / coverage (pull_request) Has been skipped
test / publish-infra (pull_request) Has been skipped
Now that #469 got the DB off the data plane, the docker backend runs the control plane and data plane as two containers instead of the combined `bot-bottle-infra` container: * bot-bottle-orchestrator — the lean control-plane container (image Dockerfile.orchestrator, `-m bot_bottle.orchestrator`). Joins the new `bot-bottle-orchestrator` control network (`--internal`) only, plus a host-loopback publish for the CLI. Sole opener of bot-bottle.db; holds the signing key; no CA, no gateway daemons. * bot-bottle-orch-gateway — the data-plane container (DockerGateway), dual-homed on the agent `bot-bottle-gateway` network AND the control network, so it resolves the orchestrator by name (http://bot-bottle-orchestrator:8099) while agents — never on the control network — have no route to the control plane (the L3 block, not just the JWT). Holds the gateway JWT + the mitmproxy CA. DockerInfraService now orchestrates the pair (builds gateway + orchestrator images, brings up the orchestrator then the gateway) and exposes gateway_name; the launch flow attributes agents against the gateway container. DockerGateway gains a control_network it joins after run. rotate_ca / the CA read target the gateway container. The combined Dockerfile.infra is no longer built by docker (firecracker/macOS still use it until their splits). pyright 0 errors; unit suite green (2273). Integration tests updated for the two-container shape but need a real-docker run to validate the networking. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
63 lines
2.3 KiB
Python
63 lines
2.3 KiB
Python
"""Rotate the shared gateway's mitmproxy CA (issue #450).
|
|
|
|
python -m bot_bottle.orchestrator.rotate_ca
|
|
|
|
A deliberate CA rollover has two halves: drop the *persisted* CA so a fresh one
|
|
is minted, and drop the *running* gateway so its mitmproxy (which holds the old
|
|
CA in memory) is replaced. This one-shot command does both:
|
|
|
|
1. Delete the persisted CA under the host gateway-CA dir — the next gateway
|
|
start generates a new one (mitmproxy reuses an existing CA, generates only
|
|
when absent).
|
|
2. Force-remove the infra / standalone-gateway containers so the stale
|
|
in-memory CA is gone; the next bottle launch's idempotent `ensure_running`
|
|
brings the gateway back up and mints the fresh CA.
|
|
|
|
It does NOT re-provision the new CA into already-running bottles — those must be
|
|
re-attached so they install the new trust anchor. Rotation is thus an explicit,
|
|
operator-driven action with a brief egress interruption, not an automatic one.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
from ..backend.docker.util import run_docker
|
|
from ..paths import host_gateway_ca_dir
|
|
from ..gateway import GATEWAY_NAME, rotate_gateway_ca
|
|
|
|
# The container whose mitmproxy would still be serving the old CA from memory:
|
|
# the per-host gateway (the data plane holds the CA; the split-out orchestrator
|
|
# never does).
|
|
_GATEWAY_CONTAINERS = (GATEWAY_NAME,)
|
|
|
|
|
|
def _out(msg: str) -> None:
|
|
sys.stdout.write(f"rotate-ca: {msg}\n")
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
del argv # no flags — a single deliberate action
|
|
ca_dir: Path = host_gateway_ca_dir()
|
|
removed = rotate_gateway_ca(ca_dir)
|
|
if removed:
|
|
_out(f"removed {len(removed)} CA file(s) from {ca_dir}")
|
|
else:
|
|
_out(f"no persisted CA under {ca_dir}; a fresh one is minted on next start")
|
|
|
|
# Drop any running gateway so its in-memory (now-stale) CA is replaced on
|
|
# the next launch. `rm --force` on an absent name is a tolerated no-op.
|
|
for name in _GATEWAY_CONTAINERS:
|
|
proc = run_docker(["docker", "rm", "--force", name])
|
|
if proc.returncode == 0 and proc.stdout.strip():
|
|
_out(f"removed running container {name}")
|
|
|
|
_out("done — the next bottle launch remints the CA; re-attach bottles to "
|
|
"install the new trust anchor")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|