didericis-claude
1a25243505
prd-number-check / require-numbered-prds (pull_request) Failing after 12s
tracker-policy-pr / check-pr (pull_request) Successful in 13s
test / integration-docker (pull_request) Successful in 20s
lint / lint (push) Failing after 56s
test / unit (pull_request) Failing after 4m4s
test / coverage (pull_request) Has been skipped
Chunk 2 of the host-control-server stack: close the PRD's **durable secret** gap and replace chunk 1's BOT_BOTTLE_BROKER_SECRET stopgap. - trust_domain.py: two new domains. LAUNCH_BROKER holds the durable HS256 key both the orchestrator (signer) and the host control server (verifier) share for the broker's launch JWT — a host-canonical key file minted 0600 on first use, so a restarted orchestrator re-verifies against the same key (re-adoption). HOST_CONTROLLER is the separate domain for the controller's own lifecycle endpoints, keyed by a key the orchestrator never holds (its lifecycle role is `host`, deliberately outside the control-plane ROLES). LaunchBrokerProvisioning is the fail-closed seam, mirroring ControlPlaneProvisioning. - orchestrator_auth.py: ROLE_HOST, outside ROLES so the orchestrator's control-plane key can neither mint nor accept it. - paths.py: key-file + env-var constants for both domains. - host_server.py / __main__.py: broker_secret() now resolves the durable LAUNCH_BROKER key — env-injected for a containerized launcher, else the host key file for a host-side dev-harness process — so `--broker http` and the host controller "just work" on one host without exporting a secret, and stay fail-closed when the root is unwritable. Tested: domain boundary (host role unmintable by the control plane, cross-domain tokens don't verify), distinct keys/env vars per domain, provisioning fail-closed, and broker_secret env/file resolution + durability. Full unit suite green; pyright clean; pylint 9.90. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
96 lines
4.0 KiB
Python
96 lines
4.0 KiB
Python
"""Run the orchestrator control plane as a plain process (PRD 0070 dev-harness).
|
|
|
|
python -m bot_bottle.orchestrator [--host H] [--port P] [--db PATH]
|
|
|
|
The PRD sequences the orchestrator as a plain-process dev-harness first, so
|
|
the consolidation core (registry + attribution + HTTP control plane + live
|
|
reload) can be exercised with fast iteration, decoupled from any VM /
|
|
container packaging. Wrapping this exact service in a backend-native unit
|
|
(docker container, then Firecracker VM) comes later.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import secrets
|
|
from pathlib import Path
|
|
|
|
from .. import log
|
|
from .store.store_manager import StoreManager
|
|
from ..paths import LAUNCH_BROKER_KEY_ENV
|
|
from .broker import StubBroker, SubmitBroker
|
|
from .broker_client import BrokerClient
|
|
from .host_server import DEFAULT_PORT, broker_secret
|
|
from .server import make_server
|
|
from .docker_broker import DockerBroker
|
|
from .store.registry_store import RegistryStore, default_db_path
|
|
from .service import OrchestratorCore
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
"""Parse args, migrate the registry, and serve the control plane."""
|
|
parser = argparse.ArgumentParser(prog="bot_bottle.orchestrator")
|
|
parser.add_argument("--host", default="127.0.0.1", help="bind address")
|
|
parser.add_argument("--port", type=int, default=8080, help="bind port (0 = ephemeral)")
|
|
parser.add_argument(
|
|
"--db", type=Path, default=None,
|
|
help=f"registry DB path (default: {default_db_path()})",
|
|
)
|
|
parser.add_argument(
|
|
"--broker", choices=("stub", "docker", "http"), default="stub",
|
|
help="launch broker: 'stub' records requests; 'docker' runs containers "
|
|
"in-process; 'http' relays signed requests to a host control server",
|
|
)
|
|
parser.add_argument(
|
|
"--host-controller-url", default=f"http://127.0.0.1:{DEFAULT_PORT}",
|
|
help="host control server URL (used only with --broker http)",
|
|
)
|
|
args = parser.parse_args(argv)
|
|
|
|
registry = RegistryStore(args.db)
|
|
registry.migrate()
|
|
# One DB per host: the supervise queue + audit tables live in the SAME
|
|
# SQLite file the registry owns, so the control plane is the single
|
|
# source of truth. The in-VM supervise daemon writes here; the host
|
|
# operator reaches it over HTTP (never a second, disconnected DB).
|
|
StoreManager(registry.db_path).migrate()
|
|
|
|
# A signing secret ties the orchestrator (signer) to its broker (verifier).
|
|
# 'stub' records launches instead of starting anything; 'docker' runs real
|
|
# containers in-process; 'http' relays signed requests to a separate host
|
|
# control server, which verifies and launches. For 'stub'/'docker' the secret
|
|
# is ephemeral (signer and verifier share this process); for 'http' it must be
|
|
# the SAME key the host controller holds, so both resolve the durable
|
|
# launch-broker TrustDomain key (env-injected, or the host key file).
|
|
broker: SubmitBroker
|
|
if args.broker == "http":
|
|
secret = broker_secret()
|
|
if secret is None:
|
|
parser.error(
|
|
f"--broker http requires the launch-broker key (${LAUNCH_BROKER_KEY_ENV}, "
|
|
"or a writable host root to mint it), matching the host control server"
|
|
)
|
|
broker = BrokerClient(args.host_controller_url)
|
|
else:
|
|
secret = secrets.token_bytes(32)
|
|
broker = DockerBroker(secret) if args.broker == "docker" else StubBroker(secret)
|
|
orchestrator = OrchestratorCore(registry, broker, secret)
|
|
|
|
server = make_server(orchestrator, host=args.host, port=args.port)
|
|
bound_host, bound_port = server.server_address[0], server.server_address[1]
|
|
log.info(
|
|
"orchestrator control plane listening",
|
|
context={"host": bound_host, "port": bound_port, "db": str(registry.db_path)},
|
|
)
|
|
try:
|
|
server.serve_forever()
|
|
except KeyboardInterrupt:
|
|
log.info("orchestrator shutting down")
|
|
finally:
|
|
server.server_close()
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|