didericis-claude
e641bacf2d
The two Debian-family CA-layout constants lived in docker/provision/ca.py, which forced the smolmachines backend to import them cross-backend (smolmachines -> docker). Move them into the shared backend/util.py next to select_ca_cert; docker, compose, and smolmachines now all import from there. No behavior change. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
78 lines
2.9 KiB
Python
78 lines
2.9 KiB
Python
"""Cross-backend utility helpers — host-side primitives shared by
|
|
every backend implementation. Backend-specific helpers live one level
|
|
deeper (e.g. bot_bottle/backend/docker/util.py)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import hashlib
|
|
import os
|
|
import ssl
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING
|
|
|
|
from ..log import die, info
|
|
|
|
if TYPE_CHECKING:
|
|
from ..egress import EgressPlan
|
|
from ..pipelock import PipelockProxyPlan
|
|
|
|
|
|
# Debian-family CA layout, shared by every backend (all guest images
|
|
# are Debian-family). AGENT_CA_PATH is the source path that
|
|
# `update-ca-certificates` reads; AGENT_CA_BUNDLE is the bundle it
|
|
# rebuilds, which curl, Python `ssl`, and OpenSSL-based tools all read
|
|
# by default.
|
|
AGENT_CA_PATH = "/usr/local/share/ca-certificates/bot-bottle-mitm-ca.crt"
|
|
AGENT_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"
|
|
|
|
|
|
def host_skill_dir(name: str) -> str:
|
|
"""Return the host-side path for a named skill:
|
|
`$HOME/.claude/skills/<name>`. Dies if HOME is unset."""
|
|
home = os.environ.get("HOME")
|
|
if not home:
|
|
die("HOME not set")
|
|
return f"{home}/.claude/skills/{name}"
|
|
|
|
|
|
def select_ca_cert(
|
|
egress_plan: EgressPlan, proxy_plan: PipelockProxyPlan
|
|
) -> tuple[Path, str]:
|
|
"""Pick the agent-facing CA cert (and a short label for the log
|
|
line) that matches the proxy the agent's HTTP_PROXY points at.
|
|
Egress wins when the bottle declares any routes (it sits in front
|
|
of pipelock); else pipelock.
|
|
|
|
Shared by every backend's `provision_ca`: launch mints the chosen
|
|
CA(s) and re-binds their host paths into these inner plans before
|
|
provision runs, so an empty/missing path here means launch's
|
|
bringup is broken — fatal."""
|
|
if egress_plan.routes:
|
|
cert = egress_plan.mitmproxy_ca_cert_only_host_path
|
|
if cert == Path() or not cert.is_file():
|
|
die(
|
|
f"egress CA cert missing at {cert or '(empty)'}; "
|
|
f"launch must have called egress_tls_init and "
|
|
f"re-bound the plan before provision"
|
|
)
|
|
return cert, "egress"
|
|
cert = proxy_plan.ca_cert_host_path
|
|
if not cert or not cert.is_file():
|
|
die(
|
|
f"pipelock CA cert missing at {cert or '(empty)'}; "
|
|
f"launch must have called pipelock_tls_init and re-bound "
|
|
f"the plan before provision"
|
|
)
|
|
return cert, "pipelock"
|
|
|
|
|
|
def log_ca_fingerprint(cert_host_path: Path, label: str) -> None:
|
|
"""Compute the cert's SHA-256 fingerprint over its DER bytes
|
|
(stdlib `ssl` + `hashlib`) and log it once to stderr — the
|
|
standard fingerprint form. Only ever touches the public cert;
|
|
the private key stays on the host under the stage dir until
|
|
teardown."""
|
|
der = ssl.PEM_cert_to_DER_cert(cert_host_path.read_text())
|
|
fingerprint = hashlib.sha256(der).hexdigest()
|
|
info(f"{label} ca fingerprint: sha256:{fingerprint[:32]}...")
|