8a1b833aaa
The shared gateway self-generates a mitmproxy CA that every bottle installs to trust its TLS interception. It was persisted on a Docker named volume, which survives `docker rm` but is silently wiped by `docker volume prune` / `docker system prune --volumes` during routine host maintenance. When that happens the gateway mints a fresh CA on restart, and every already-running bottle fails the TLS handshake even after it re-resolves and reconnects to the moved gateway — a re-attachment blocker distinct from #443/#445. Move CA persistence to a host bind-mount under the app-data root (`bot_bottle_root()/gateway-ca`, via `host_gateway_ca_dir()`), mirroring how the shared DB and control-plane token already live on the host. Docker never prunes a path under the root, and it stays inspectable + rotatable from the host. mitmproxy already adopts an existing CA and generates one only on first run, so the bind-mount gives adopt-existing/generate-on-first-run for free. Add an explicit rollover path: `rotate_gateway_ca()` clears the persisted CA so the next start remints it, and `python -m bot_bottle.orchestrator.rotate_ca` wires that together with dropping the running gateway container (whose mitmproxy still holds the old CA in memory). Rotation stays an operator action — it doesn't auto-re-provision running bottles, which re-attach to pick up the new anchor. Scope: the Docker infra/gateway path (the "infra container" in the report). The macOS (`container`-only volume) and Firecracker (VM-attached ext4) backends persist the CA differently and are unaffected. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
128 lines
5.3 KiB
Python
128 lines
5.3 KiB
Python
"""Foundational filesystem paths for bot-bottle.
|
|
|
|
`bot_bottle_root()` is the app data root — state, queue, audit logs,
|
|
git-gate keys, and the shared DB all live under it. It defaults to
|
|
`~/.bot-bottle` and is overridable with the **`BOT_BOTTLE_ROOT`** env var.
|
|
|
|
The env override is the single knob for redirecting the root: the test
|
|
suite points it at a throwaway dir instead of monkey-patching the function
|
|
(every module and every flat/package copy reads the same env var, so one
|
|
override covers them all), and operators can relocate the root if needed.
|
|
|
|
This module has no bot-bottle imports, so it is safe to import from any
|
|
layer (and to COPY flat into the gateway).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import secrets
|
|
import stat
|
|
from pathlib import Path
|
|
|
|
# The single shared host state DB. All bot-bottle SQLite stores (supervise
|
|
# queue, audit, the orchestrator registry) co-tenant this one file — the
|
|
# TableMigrations schema_key namespaces each store's tables.
|
|
HOST_DB_FILENAME = "bot-bottle.db"
|
|
|
|
# The per-host control-plane secret file, and the env var the launchers inject
|
|
# its value into. The control plane requires this secret on every mutating /
|
|
# reading route (see orchestrator/control_plane.py); it is held only by the
|
|
# trusted callers (control plane, gateway, host CLI) and never handed to an
|
|
# agent, so an agent that can reach the control-plane port still can't drive it.
|
|
CONTROL_PLANE_TOKEN_FILENAME = "control-plane-token"
|
|
CONTROL_PLANE_TOKEN_ENV = "BOT_BOTTLE_CONTROL_PLANE_TOKEN"
|
|
|
|
# The host directory holding the gateway's persistent mitmproxy CA. Bind-mounted
|
|
# into the infra/gateway container at mitmproxy's confdir so the self-generated
|
|
# CA survives container recreation — every agent installs this one CA to trust
|
|
# the shared gateway's TLS interception, so it must not rotate on restart. See
|
|
# host_gateway_ca_dir() for why this is a host bind-mount, not a named volume.
|
|
GATEWAY_CA_DIRNAME = "gateway-ca"
|
|
|
|
|
|
def bot_bottle_root() -> Path:
|
|
"""The app data root — `$BOT_BOTTLE_ROOT` if set, else `~/.bot-bottle`."""
|
|
override = os.environ.get("BOT_BOTTLE_ROOT")
|
|
return Path(override) if override else Path.home() / ".bot-bottle"
|
|
|
|
|
|
def host_db_path() -> Path:
|
|
"""Path to the shared host state DB, `<root>/db/bot-bottle.db`.
|
|
|
|
Kept in its own `db/` subdirectory (not directly under the root) so a
|
|
backend that can only bind-mount *directories* can share this one file
|
|
with a gateway without exposing the root's other contents (git-gate
|
|
keys, per-bottle state, ...)."""
|
|
return bot_bottle_root() / "db" / HOST_DB_FILENAME
|
|
|
|
|
|
def host_db_dir() -> Path:
|
|
"""The directory holding the shared host state DB, created if missing.
|
|
Backends bind-mount this into their gateway so the supervise daemon writes
|
|
to the one DB the orchestrator (and the operator over HTTP) reads."""
|
|
db_dir = host_db_path().parent
|
|
db_dir.mkdir(parents=True, exist_ok=True)
|
|
return db_dir
|
|
|
|
|
|
def host_gateway_ca_dir() -> Path:
|
|
"""The directory holding the gateway's persistent mitmproxy CA, created if
|
|
missing. Backends bind-mount this into the infra/gateway container at
|
|
mitmproxy's confdir so the CA persists across container recreation.
|
|
|
|
A host bind-mount under the app-data root — deliberately NOT a Docker
|
|
named volume. A named volume survives `docker rm` but is silently wiped by
|
|
`docker volume prune` / `docker system prune --volumes` during routine host
|
|
maintenance; the gateway then mints a fresh CA that every already-running
|
|
bottle distrusts, failing the TLS handshake even after it reconnects to the
|
|
moved gateway (issue #450). A path under the root docker never prunes it,
|
|
and it stays directly inspectable + rotatable from the host."""
|
|
ca_dir = bot_bottle_root() / GATEWAY_CA_DIRNAME
|
|
ca_dir.mkdir(parents=True, exist_ok=True)
|
|
return ca_dir
|
|
|
|
|
|
def host_control_plane_token() -> str:
|
|
"""The per-host control-plane secret, minted (256-bit, url-safe) and
|
|
persisted 0600 on first use, then reused.
|
|
|
|
This is the shared secret the launchers inject into the control-plane and
|
|
gateway containers and that the host CLI presents on every call. It is a
|
|
*host* artifact — the file lives under the root the agent never mounts, and
|
|
the env var is set only on the trusted containers — so reading it here is
|
|
safe on the host launch path but the value never reaches a bottle."""
|
|
path = bot_bottle_root() / CONTROL_PLANE_TOKEN_FILENAME
|
|
try:
|
|
existing = path.read_text().strip()
|
|
if existing:
|
|
return existing
|
|
except OSError:
|
|
pass
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
token = secrets.token_urlsafe(32)
|
|
# Create 0600 up front (O_EXCL loses a concurrent race harmlessly — we
|
|
# re-read the winner's token below) so the secret is never briefly world-
|
|
# readable between write and chmod.
|
|
try:
|
|
fd = os.open(path, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600)
|
|
except FileExistsError:
|
|
return path.read_text().strip()
|
|
with os.fdopen(fd, "w") as f:
|
|
f.write(token)
|
|
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
|
|
return token
|
|
|
|
|
|
__all__ = [
|
|
"HOST_DB_FILENAME",
|
|
"CONTROL_PLANE_TOKEN_FILENAME",
|
|
"CONTROL_PLANE_TOKEN_ENV",
|
|
"GATEWAY_CA_DIRNAME",
|
|
"bot_bottle_root",
|
|
"host_db_path",
|
|
"host_db_dir",
|
|
"host_gateway_ca_dir",
|
|
"host_control_plane_token",
|
|
]
|