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:
@@ -1,7 +1,8 @@
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { render, screen, waitFor } from "@testing-library/react";
|
||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||
import SharedAuthSettings from "./SharedAuthSettings";
|
||||
import type { Project } from "../../lib/types";
|
||||
import { useAppState } from "../../store/appState";
|
||||
import type { ClearTokenOutcome, Project } from "../../lib/types";
|
||||
|
||||
const hasClaudeToken = vi.fn();
|
||||
const clearClaudeToken = vi.fn();
|
||||
@@ -63,8 +64,29 @@ describe("SharedAuthSettings", () => {
|
||||
vi.clearAllMocks();
|
||||
projects = [];
|
||||
hasClaudeToken.mockResolvedValue(false);
|
||||
useAppState.setState({ toasts: [] });
|
||||
});
|
||||
|
||||
/** Open the confirmation and go through with it. */
|
||||
async function revoke(outcome: Partial<ClearTokenOutcome>) {
|
||||
projects = [running()];
|
||||
hasClaudeToken.mockResolvedValue(true);
|
||||
clearClaudeToken.mockResolvedValue({
|
||||
snapshots_scrubbed: [],
|
||||
snapshots_failed: [],
|
||||
snapshots_superseded: [],
|
||||
docker_unavailable: null,
|
||||
...outcome,
|
||||
});
|
||||
render(<SharedAuthSettings />);
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Revoke" }));
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Revoke token" }));
|
||||
await waitFor(() =>
|
||||
expect(useAppState.getState().toasts.length).toBeGreaterThan(0),
|
||||
);
|
||||
return useAppState.getState().toasts[0];
|
||||
}
|
||||
|
||||
it("disables Authenticate and says why when nothing is running", async () => {
|
||||
projects = [baseProject];
|
||||
render(<SharedAuthSettings />);
|
||||
@@ -123,4 +145,48 @@ describe("SharedAuthSettings", () => {
|
||||
await screen.findByText("keyring backend unavailable");
|
||||
expect(screen.queryByRole("button", { name: "Revoke" })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
// ── Revoking has to tell the truth ──────────────────────────────────────
|
||||
// Deleting the keychain entry is only part of it. `docker commit` copies the
|
||||
// token into each project's snapshot image, and an image outlives every
|
||||
// container built from it — so a "removed" message while a snapshot still
|
||||
// holds a live ~1-year credential is the wrong thing to say.
|
||||
|
||||
it("says so plainly when snapshot images were cleared too", async () => {
|
||||
const toast = await revoke({
|
||||
snapshots_scrubbed: ["triple-c-snapshot-p1:latest"],
|
||||
});
|
||||
expect(toast.kind).toBe("success");
|
||||
expect(toast.message).toMatch(/1 snapshot image/);
|
||||
});
|
||||
|
||||
it("reports an error, not success, when an image still holds the token", async () => {
|
||||
const toast = await revoke({
|
||||
snapshots_failed: ["triple-c-snapshot-p1:latest: image has child images"],
|
||||
});
|
||||
expect(toast.kind).toBe("error");
|
||||
expect(toast.message).toMatch(/still in some images/i);
|
||||
expect(toast.detail).toMatch(/triple-c-snapshot-p1/);
|
||||
});
|
||||
|
||||
it("does not claim the images are clean when Docker could not be reached", async () => {
|
||||
const toast = await revoke({ docker_unavailable: "Docker is not running" });
|
||||
expect(toast.kind).toBe("error");
|
||||
expect(toast.detail).toMatch(/Docker could not be reached/);
|
||||
});
|
||||
|
||||
it("mentions a retained image layer without calling the revoke a failure", async () => {
|
||||
const toast = await revoke({
|
||||
snapshots_scrubbed: ["triple-c-snapshot-p1:latest"],
|
||||
snapshots_superseded: ["triple-c-snapshot-p1:latest"],
|
||||
});
|
||||
expect(toast.kind).toBe("success");
|
||||
expect(toast.detail).toMatch(/still on disk because a container is running/);
|
||||
});
|
||||
|
||||
it("still succeeds plainly when there was nothing to scrub", async () => {
|
||||
const toast = await revoke({});
|
||||
expect(toast.kind).toBe("success");
|
||||
expect(toast.message).toBe("Shared Claude token removed from the keychain.");
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user