Adversarial review of the branch produced findings across four areas. This addresses them, plus the Windows CI environment. Secrets. commit_container_snapshot baked the container's full env into the per-project snapshot image, so the shared OAuth token — and the AWS keys, git token and gateway master key — outlived revocation and were readable via docker inspect. Verified against Engine 29.6 that a commit body's config merges over the container's: keys cannot be dropped but can be overwritten, so all of them now commit as KEY=. clear_claude_token additionally rewrites images from earlier builds and reports honestly when a tag could not be rewritten. The recommendation to move the token out of env entirely was not taken, with reasoning: apiKeyHelper is a different auth method that outranks CLAUDE_CODE_OAUTH_TOKEN rather than a transport for it, and no file-based delivery exists. The durable exposure — the image — is what is closed here. Separately noted, not fixed: entrypoint.sh captures the token into the scheduler's .env inside the persisted volume. URL spoofing. Three call sites reached openUrl with container-controlled strings, one of which the review missed (the WebLinksAddon handler). The sign-in URL was scraped from container output with a longest-match tie-break and no userinfo check, so claude.ai@evil.tld rendered as "claude.ai…" in a truncating element. There is now one sanitizer in front of every sink — scheme allowlist, no userinfo, C0/C1 and quote rejection, host allowlist for the sign-in case, first-match — and the origin renders un-truncated. The toast is keyed so a changed URL remounts, closing a bait-and-switch where the user read one URL and clicked another. Migration. The rollback pin was best-effort: a tag failure was logged and the migration continued past remove_container, after which the final commit overwrote the only copy of the old system layer. It now aborts before anything destructive and reads the tag back. /var was destroyed while the ordinary recreate path preserves it — making the "safe" alternative to Reset more destructive than Reset's alternative; data-bearing subtrees are now detected and disclosed in the pre-flight rather than copied, since tarring a live database onto a different base's packages is a corruption risk. resume_migration now verifies the migration-state label instead of reporting success for a container that never swapped. dismiss actually resolves the record rather than leaving the feature permanently refusing to migrate. Start and Reset are guarded while a migration is live. Lifecycle. The gateway no longer publishes on 0.0.0.0 — bind address and advertised URL are derived together so they cannot drift. Disabling it now stops it. App exit runs teardown concurrently under a budget with a visible shutting-down state instead of blocking for minutes. Auto-starts retry when Docker is not up yet, and the polling-recovery path now reconciles, so interrupted migrations are still recovered. Auth-bridge forwards are capped, closing a container-driven fd exhaustion. Windows CI. build-windows failed on this branch with "linker link.exe not found". The runner had no MSVC build tools and the workflow assumed a hand-provisioned machine, so a bare runner registers, accepts jobs and fails at link time after downloading the whole crate graph. The job now installs the VC++ workload when vswhere cannot find it, matching how it already conditionally installs Rust and Node. 192 Rust tests, 274 frontend tests, both builds clean, zero warnings. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
293 lines
13 KiB
Rust
293 lines
13 KiB
Rust
//! Contract types for **container base-image migration**.
|
|
//!
|
|
//! ## Why this exists
|
|
//!
|
|
//! A project's container is created from `triple-c-snapshot-<id>:latest`
|
|
//! whenever that image exists, and every recreation re-commits it. Nothing ever
|
|
//! moved a project back onto a *newer base image*: `container_needs_recreation`
|
|
//! compared the container's actual image against the `triple-c.image` label that
|
|
//! `create_container` wrote from the very image it created from — a tautology
|
|
//! that could never fire. So a project stayed pinned to its own snapshot
|
|
//! lineage forever and never picked up base-image fixes (a new `socat`, a new
|
|
//! `/usr/local/bin` shim, security updates). The only escape was Reset, which
|
|
//! deletes both named volumes and takes the login, the skills and every session
|
|
//! transcript with it.
|
|
//!
|
|
//! Migration is the non-destructive alternative: recreate the container from the
|
|
//! current base, then replay onto it the small set of things the base does not
|
|
//! carry, and leave the volumes strictly alone.
|
|
//!
|
|
//! ## What actually needs replaying
|
|
//!
|
|
//! `/home/claude` is the named volume `triple-c-home-<id>`, with
|
|
//! `/home/claude/.claude` nested inside it. The image's own `/home/claude` is
|
|
//! **seed-only** — once the volume is mounted the image's copy is masked
|
|
//! permanently. So Claude Code itself (it installs to `~/.local/bin`), cargo,
|
|
//! uv, ruff, the OAuth login, `~/.claude.json`, skills, transcripts, scheduler
|
|
//! tasks and SSH keys all re-attach for free across an image swap.
|
|
//!
|
|
//! What is genuinely lost is confined to the container's writable layer:
|
|
//! root-level `apt` installs, `npm -g` packages (npm's prefix is `/usr`),
|
|
//! `/usr/local`, `/opt`, `/srv`, anything under `/workspace` that is not on a
|
|
//! bind mount — and **`/var`**. The first four are what [`MigrationOptions`]
|
|
//! can replay. `/var` is not, and that gap is deliberate rather than an
|
|
//! oversight, so it is stated here rather than glossed over:
|
|
//!
|
|
//! Service state lives in `/var/lib/<service>` and `/var/www`. Replaying the
|
|
//! apt delta reinstalls `postgresql` onto the new base and hands back an
|
|
//! **empty** cluster; the old one is gone with the writable layer. The
|
|
//! ordinary recreate path does not have this problem, because it creates from
|
|
//! the project's own snapshot and `/var` rides along — so a silent migration
|
|
//! would be *more* destructive than the thing it is sold as a safer
|
|
//! alternative to.
|
|
//!
|
|
//! Copying a live database's files out with `tar` and unpacking them onto a
|
|
//! different base's version of the same package is not a fix; it is a
|
|
//! corruption risk wearing a fix's clothes. So the answer is disclosure:
|
|
//! [`crate::docker::migration::unpreserved_data`] finds the data-bearing
|
|
//! subtrees under `/var` that the base does not ship, and
|
|
//! [`ContainerStaleness::unpreserved_data`] carries them into the pre-flight,
|
|
//! where the user is told to back them up before anything is touched.
|
|
//!
|
|
//! ## Serde
|
|
//!
|
|
//! Plain snake_case, matching every other IPC struct in this crate
|
|
//! (`ContainerInfo`, `ClaudeSession`, …) and `app/src/lib/types.ts`.
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
/// How a finished migration attempt ended.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum MigrationPhase {
|
|
/// The container now runs on the current base and everything requested was
|
|
/// replayed.
|
|
Succeeded,
|
|
/// The container now runs on the current base, but at least one package or
|
|
/// path could not be replayed. Deliberately distinct from `Failed`: one
|
|
/// missing apt package must never cost the user the whole migration.
|
|
Partial,
|
|
/// The migration could not complete. If the container had already been
|
|
/// swapped, an automatic rollback was attempted — check
|
|
/// [`MigrationReport::rollback_available`] and the message.
|
|
Failed,
|
|
/// The migration was undone; the container is back on its pre-migration
|
|
/// snapshot image.
|
|
RolledBack,
|
|
}
|
|
|
|
/// One package that could not be replayed onto the new base.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub struct PackageFailure {
|
|
pub name: String,
|
|
/// Trimmed tail of the package manager's own error output.
|
|
pub reason: String,
|
|
}
|
|
|
|
/// A data-bearing subtree the migration will destroy and cannot put back.
|
|
///
|
|
/// See [`crate::docker::migration::unpreserved_data`]. Surfaced in the
|
|
/// pre-flight so the user can take a backup first; never copied.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub struct UnpreservedData {
|
|
/// Absolute path of the directory, e.g. `/var/lib/postgresql`.
|
|
pub path: String,
|
|
/// Total size of the non-package files beneath it.
|
|
pub bytes: u64,
|
|
/// How many non-package files it holds.
|
|
pub file_count: u32,
|
|
}
|
|
|
|
/// Everything the UI needs to decide whether a project is worth migrating, and
|
|
/// to explain to the user what migrating would actually change.
|
|
///
|
|
/// A field being empty always means "nothing found", never "not checked" —
|
|
/// [`ContainerStaleness::probe_error`] is the single place a failed inspection
|
|
/// is reported.
|
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
|
pub struct ContainerStaleness {
|
|
/// The container's lineage is not the current base image.
|
|
/// Always `false` when `known` is `false` — an unknown lineage is not a
|
|
/// claim of staleness.
|
|
pub stale: bool,
|
|
/// Whether the lineage could be established at all. `false` means the
|
|
/// container (or its snapshot image) predates the `triple-c.base-image-id`
|
|
/// label, i.e. **"unknown, probe instead"** — never "stale".
|
|
pub known: bool,
|
|
/// Image ID of the base this container's lineage descends from.
|
|
pub base_image_id: Option<String>,
|
|
/// Image ID of the base image currently configured in settings.
|
|
pub current_base_image_id: Option<String>,
|
|
/// `Created` timestamp of the project's snapshot image, RFC 3339.
|
|
pub snapshot_created_at: Option<String>,
|
|
/// Concrete paths the current base ships that this container does not,
|
|
/// e.g. `/usr/bin/socat`.
|
|
pub missing_paths: Vec<String>,
|
|
/// Human labels for the same, e.g. `"Auth bridge tunnel (socat)"`.
|
|
pub missing_features: Vec<String>,
|
|
/// `apt-mark showmanual` in the container minus the base's own set — the
|
|
/// packages a migration would replay.
|
|
pub apt_delta: Vec<String>,
|
|
/// Globally-installed npm packages the base does not ship.
|
|
pub npm_global_delta: Vec<String>,
|
|
/// Non-dpkg-owned paths under the verbatim-copy roots that would be carried
|
|
/// across. Empty when nothing user-authored was found.
|
|
pub verbatim_paths: Vec<String>,
|
|
/// Data-bearing subtrees under `/var` that a migration **destroys and
|
|
/// cannot restore** — a database's files, a served site. Empty on an
|
|
/// ordinary container; when it is not, the pre-flight has to say so before
|
|
/// anything is touched. See [`UnpreservedData`].
|
|
#[serde(default)]
|
|
pub unpreserved_data: Vec<UnpreservedData>,
|
|
/// dpkg packages the current base carries at a different version than this
|
|
/// container does. A rough "how much security drift" number, not a promise
|
|
/// that every one of them is newer.
|
|
pub outdated_package_count: u32,
|
|
/// Set when the container/image could not be inspected. Everything else is
|
|
/// then at its default.
|
|
pub probe_error: Option<String>,
|
|
}
|
|
|
|
/// What a migration should replay. All three default to off so that
|
|
/// `MigrationOptions::default()` is the minimal, fastest migration.
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
|
|
pub struct MigrationOptions {
|
|
/// Replay the apt and `npm -g` deltas onto the new base.
|
|
#[serde(default)]
|
|
pub replay_packages: bool,
|
|
/// Copy the verbatim payload (`/usr/local`, `/opt`, `/srv`, and the
|
|
/// non-bind-mounted parts of `/workspace`) onto the new base.
|
|
#[serde(default)]
|
|
pub copy_paths: bool,
|
|
/// Keep the `:pre-migration-<ts>` rollback tag after the migration reports
|
|
/// success. Costs the full size of the old snapshot image (snapshots share
|
|
/// almost no layers with the current base) but makes rollback instant.
|
|
#[serde(default)]
|
|
pub keep_rollback: bool,
|
|
}
|
|
|
|
/// The outcome of one migration attempt.
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
pub struct MigrationReport {
|
|
pub phase: MigrationPhase,
|
|
pub packages_requested: Vec<String>,
|
|
pub packages_installed: Vec<String>,
|
|
pub packages_failed: Vec<PackageFailure>,
|
|
pub paths_copied: Vec<String>,
|
|
/// Human labels for base features the container gained, e.g.
|
|
/// `"Auth bridge tunnel (socat)"`.
|
|
pub features_restored: Vec<String>,
|
|
/// A `:pre-migration-<ts>` image tag still exists, so
|
|
/// `rollback_migration` can put the old system layer back.
|
|
pub rollback_available: bool,
|
|
/// One paragraph fit to show the user verbatim.
|
|
pub message: String,
|
|
}
|
|
|
|
impl MigrationReport {
|
|
/// A report for a migration that never got past pre-flight. Nothing was
|
|
/// touched, so there is nothing to roll back.
|
|
pub fn failed_preflight(message: impl Into<String>) -> Self {
|
|
Self {
|
|
phase: MigrationPhase::Failed,
|
|
packages_requested: Vec::new(),
|
|
packages_installed: Vec::new(),
|
|
packages_failed: Vec::new(),
|
|
paths_copied: Vec::new(),
|
|
features_restored: Vec::new(),
|
|
rollback_available: false,
|
|
message: message.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// What a migration decided to do, frozen at pre-flight time.
|
|
///
|
|
/// Persisted with the state because a **resume** cannot recompute it: by the
|
|
/// time the app comes back up the container has already been replaced by one
|
|
/// created from the base, so its apt/npm sets *are* the base's and the deltas
|
|
/// would come out empty.
|
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
|
pub struct MigrationPlan {
|
|
pub apt_packages: Vec<String>,
|
|
pub npm_packages: Vec<String>,
|
|
pub verbatim_paths: Vec<String>,
|
|
/// Base-image paths the old container lacked, so the finished migration can
|
|
/// report which of them it actually gained.
|
|
pub missing_paths: Vec<String>,
|
|
/// What the pre-flight found under `/var` that the migration would destroy.
|
|
/// Frozen here so the finished report can name it even though the container
|
|
/// it was measured on no longer exists.
|
|
#[serde(default)]
|
|
pub unpreserved_data: Vec<UnpreservedData>,
|
|
}
|
|
|
|
/// Persisted, host-side migration state. Written **before** anything
|
|
/// destructive happens and removed on confirm or rollback, so a crash at any
|
|
/// point leaves a record of what was in flight.
|
|
///
|
|
/// `phase` is a free-form string rather than [`MigrationPhase`] because it also
|
|
/// carries the *in-flight* phases, which are not outcomes:
|
|
///
|
|
/// | `phase` | Meaning | Offered next |
|
|
/// |---|---|---|
|
|
/// | `in-progress` | A migration is running right now | — |
|
|
/// | `interrupted` | The app died after the container swap | resume, rollback |
|
|
/// | `awaiting-confirmation` | Migration finished; rollback still possible | confirm, rollback |
|
|
///
|
|
/// See [`MIGRATION_PHASE_IN_PROGRESS`] and friends.
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
pub struct MigrationState {
|
|
pub phase: String,
|
|
/// Image ID of the snapshot the project was on before the swap.
|
|
pub from_image_id: Option<String>,
|
|
/// Image ID of the base being migrated to.
|
|
pub to_base_id: Option<String>,
|
|
/// RFC 3339.
|
|
pub started_at: String,
|
|
/// Present once the attempt produced one.
|
|
#[serde(default)]
|
|
pub report: Option<MigrationReport>,
|
|
/// The `:pre-migration-<ts>` tag holding the old system layer, if one was
|
|
/// created. `rollback_migration` retags this back to `:latest`.
|
|
#[serde(default)]
|
|
pub rollback_image: Option<String>,
|
|
/// Host path of the staged verbatim payload tar, if one was staged.
|
|
#[serde(default)]
|
|
pub staging_path: Option<String>,
|
|
/// The options the attempt was started with, so a resume replays the same
|
|
/// things the user originally asked for.
|
|
#[serde(default)]
|
|
pub options: MigrationOptions,
|
|
/// The frozen pre-flight plan. See [`MigrationPlan`].
|
|
#[serde(default)]
|
|
pub plan: Option<MigrationPlan>,
|
|
}
|
|
|
|
/// A migration is running in this process right now.
|
|
pub const MIGRATION_PHASE_IN_PROGRESS: &str = "in-progress";
|
|
/// The app died after the container swap but before the final commit.
|
|
pub const MIGRATION_PHASE_INTERRUPTED: &str = "interrupted";
|
|
/// The migration finished; the user has not yet confirmed or rolled back.
|
|
pub const MIGRATION_PHASE_AWAITING: &str = "awaiting-confirmation";
|
|
|
|
impl MigrationState {
|
|
pub fn new(
|
|
from_image_id: Option<String>,
|
|
to_base_id: Option<String>,
|
|
options: MigrationOptions,
|
|
) -> Self {
|
|
Self {
|
|
phase: MIGRATION_PHASE_IN_PROGRESS.to_string(),
|
|
from_image_id,
|
|
to_base_id,
|
|
started_at: chrono::Utc::now().to_rfc3339(),
|
|
report: None,
|
|
rollback_image: None,
|
|
staging_path: None,
|
|
options,
|
|
plan: None,
|
|
}
|
|
}
|
|
}
|