Fix review findings: secrets in snapshots, URL spoofing, migration data loss
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>
This commit is contained in:
@@ -22,6 +22,7 @@ const STALE: ContainerStaleness = {
|
||||
apt_delta: ["socat", "bubblewrap"],
|
||||
npm_global_delta: [],
|
||||
verbatim_paths: [],
|
||||
unpreserved_data: [],
|
||||
outdated_package_count: 61,
|
||||
probe_error: null,
|
||||
};
|
||||
@@ -30,6 +31,7 @@ function migration(overrides: Partial<ContainerMigration> = {}): ContainerMigrat
|
||||
return {
|
||||
staleness: STALE,
|
||||
probing: false,
|
||||
probeSettled: true,
|
||||
running: false,
|
||||
recovered: false,
|
||||
interrupted: null,
|
||||
@@ -41,7 +43,7 @@ function migration(overrides: Partial<ContainerMigration> = {}): ContainerMigrat
|
||||
resume: vi.fn(async () => {}),
|
||||
keep: vi.fn(async () => {}),
|
||||
rollback: vi.fn(async () => {}),
|
||||
dismiss: vi.fn(),
|
||||
dismiss: vi.fn(async () => {}),
|
||||
refresh: vi.fn(async () => {}),
|
||||
...overrides,
|
||||
};
|
||||
@@ -153,18 +155,95 @@ describe("MigrateContainerModal", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("does not ask to copy paths when there are none to copy", async () => {
|
||||
it("never derives copy_paths from a delta the probe may not have read", async () => {
|
||||
// The regression: `copy_paths: copyPaths && verbatim.length > 0` read the
|
||||
// toggle's meaning off `staleness`, which is null while the ~6 s probe
|
||||
// runs. That sent `copy_paths: false` to a backend that recomputes the
|
||||
// real set but honours the flag — files silently not copied, while this
|
||||
// dialog said there was nothing to copy. The toggle's own value is the
|
||||
// only thing that may be sent; the backend skips the step when *its* set
|
||||
// comes out empty, which is the only place that knows.
|
||||
const { m } = await renderModal({ ...STALE, verbatim_paths: [] });
|
||||
fireEvent.click(
|
||||
screen.getByRole("button", { name: "Update container base" }),
|
||||
);
|
||||
expect(m.start).toHaveBeenCalledWith({
|
||||
replay_packages: true,
|
||||
copy_paths: false,
|
||||
copy_paths: true,
|
||||
keep_rollback: true,
|
||||
});
|
||||
});
|
||||
|
||||
it("cannot be started until the probe has settled, and says so", async () => {
|
||||
await renderModal(null, { probeSettled: false, probing: true });
|
||||
expect(
|
||||
screen.getByRole("button", { name: "Update container base" }),
|
||||
).toBeDisabled();
|
||||
expect(
|
||||
screen.getByText(/lists below are not complete until it finishes/i),
|
||||
).toBeInTheDocument();
|
||||
// "None found" and "not checked yet" must not be the same sentence.
|
||||
expect(
|
||||
screen.getByText(/Still checking which apt packages/i),
|
||||
).toBeInTheDocument();
|
||||
expect(screen.getByText("Not checked yet.")).toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByText(/No extra apt packages were found/i),
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("names the data under /var that the update destroys and cannot restore", async () => {
|
||||
await renderModal({
|
||||
...STALE,
|
||||
unpreserved_data: [
|
||||
{ path: "/var/lib/postgresql", bytes: 41_000_000, file_count: 912 },
|
||||
],
|
||||
});
|
||||
const panel = screen.getByTestId("migration-unpreserved");
|
||||
expect(panel.textContent).toMatch(/\/var\/lib\/postgresql/);
|
||||
expect(panel.textContent).toMatch(/41\.0 MB in 912 files/);
|
||||
expect(panel.textContent).toMatch(/reinstalling the package does not bring it back/i);
|
||||
});
|
||||
|
||||
it("says plainly that /var is not carried across even when nothing is at risk", async () => {
|
||||
await renderModal();
|
||||
const panel = screen.getByTestId("migration-unpreserved");
|
||||
expect(panel.textContent).toMatch(/nothing here to lose/i);
|
||||
expect(panel.textContent).toMatch(/Data written under \/var is not carried across/i);
|
||||
});
|
||||
|
||||
it("offers Resume rather than Keep on a container that is mid-swap", async () => {
|
||||
// Keep drops the rollback image, and on an unfinished migration
|
||||
// `:latest` still points at the old lineage — so Keep here deletes the
|
||||
// only way back from a container the app can no longer reason about.
|
||||
const { m } = await renderModal(STALE, {
|
||||
interrupted: {
|
||||
phase: "interrupted",
|
||||
from_image_id: "sha256:aaa",
|
||||
to_base_id: "sha256:bbb",
|
||||
started_at: "2026-08-09T10:00:00Z",
|
||||
report: null,
|
||||
rollback_image: "triple-c-snapshot-p1:pre-migration-20260809-100000",
|
||||
staging_path: null,
|
||||
options: { replay_packages: true, copy_paths: true, keep_rollback: true },
|
||||
plan: null,
|
||||
},
|
||||
report: {
|
||||
phase: "failed",
|
||||
packages_requested: [],
|
||||
packages_installed: [],
|
||||
packages_failed: [],
|
||||
paths_copied: [],
|
||||
features_restored: [],
|
||||
rollback_available: true,
|
||||
message: "saving it failed",
|
||||
},
|
||||
});
|
||||
expect(screen.queryByRole("button", { name: "Keep" })).not.toBeInTheDocument();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Resume update" }));
|
||||
expect(m.resume).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("does not start anything on cancel", async () => {
|
||||
const { m, onClose } = await renderModal();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
|
||||
|
||||
Reference in New Issue
Block a user