Three things, all reachable from a single credential-handling round.
**The "Retry snapshot cleanup" button deleted the token.** `clear_claude_token`
called `secure::delete_claude_oauth_token()` unconditionally; the `mode`
argument only changed the toast wording, so there was no sweep-only path on the
wire. The leftover panel rendered on `leftover !== null` alone and
`onAuthenticated` never cleared it, so the sequence revoke -> snapshot skipped
-> re-authenticate from the button directly above -> press the retry the panel
is still offering threw away the token acquired seconds earlier, announced by a
message about images. The deliberate Revoke needs a confirmation modal; this
needed nothing.
`sweep_claude_token_snapshots` is the honest primitive: it rewrites the images
and never touches the keychain. The images are the durable record, so the retry
re-derives its work from Docker and needs no stored token. Re-authenticating
now clears the panel, and the Authenticate button is disabled while a cleanup
runs — a sweep is a per-image inspect/create/commit/rmi over the Docker socket
and takes minutes.
**Sweep-first left the token live for that whole window.** The keychain delete
sat behind `list_images` plus the per-image loop, at bollard's 120s-per-request
default, while the UI said "Revoking...". A quit or crash in there and nothing
was revoked at all; worse, `has_claude_token` stayed true and
`shared_claude_auth` reads the keychain at container-*create* time, so a
project whose `SecretScrub` guard had already released could be started later
in the same sweep and be handed a fresh copy of the credential in its env.
Keychain-first now, and the comment that claimed "no window in which a scrubbed
image is re-poisoned" — true of images, silent about containers — is corrected.
The reorder's original justification (crash-mid-sweep recoverability) is what
the sweep-only command covers.
A keychain refusal no longer discards a scrub report, because nothing has been
swept yet, and both remedies stay on screen: Revoke, and the image sweep, which
is now offered in every state rather than only when nothing is stored.
**`update_project` validating every folder list bricked existing projects.** It
validated nothing until recently while `WorkspaceSection` saved `{paths}` on
every blur, so `projects.json` can hold a half-filled row, a mount name with a
space, a duplicate, or `/` as a host path. Any such project became entirely
unsavable — every Config toggle, every permission-mode change and
`useTerminal.ts`'s tab rename came back with a message about folders — and
refusing the save did not unmount anything. `validate_project_paths_update`
admits a row carried over verbatim from what is stored and holds a new or
edited row to every rule, which keeps the escalation closed: introducing a bad
value through this command is exactly what a non-carried-over row is. The
`/workspace/../tmp/claude-x` chain is the one exception and runs on every row
regardless, because a stored one is live data loss rather than untidy data.
`ssh_key_path` and `ca_cert_path` had no check at all; a filesystem root there
read-only bind-mounts the whole host at /tmp/.host-ssh. Refused on change, with
the same grandfathering.
Tests are mutation-checked: reverting to sweep-first fails all four new Rust
ordering tests, pointing the retry back at `clear_claude_token` fails five
frontend tests, and validating an update in isolation fails the legacy-data
tests.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GBq2rGum6GX7xXgsas1fDc
443 lines
18 KiB
TypeScript
443 lines
18 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
|
import SharedAuthSettings from "./SharedAuthSettings";
|
|
import { useAppState } from "../../store/appState";
|
|
import type { ClearTokenOutcome, Project } from "../../lib/types";
|
|
|
|
const hasClaudeToken = vi.fn();
|
|
const clearClaudeToken = vi.fn();
|
|
const sweepClaudeTokenSnapshots = vi.fn();
|
|
|
|
vi.mock("../../lib/tauri-commands", () => ({
|
|
hasClaudeToken: () => hasClaudeToken(),
|
|
clearClaudeToken: () => clearClaudeToken(),
|
|
sweepClaudeTokenSnapshots: () => sweepClaudeTokenSnapshots(),
|
|
acquireClaudeToken: vi.fn(),
|
|
submitClaudeTokenCode: vi.fn(),
|
|
}));
|
|
|
|
// Stood in for so a sign-in can be *completed* in a test. The panel's reaction
|
|
// to `onAuthenticated` is the subject of the H1 sequence below, and driving the
|
|
// real acquisition dialog to get there would test the dialog instead.
|
|
vi.mock("./ClaudeAuthModal", () => ({
|
|
default: ({
|
|
onAuthenticated,
|
|
onClose,
|
|
}: {
|
|
onAuthenticated: () => void;
|
|
onClose: () => void;
|
|
}) => (
|
|
<button
|
|
onClick={() => {
|
|
onAuthenticated();
|
|
onClose();
|
|
}}
|
|
>
|
|
finish sign-in
|
|
</button>
|
|
),
|
|
}));
|
|
|
|
vi.mock("@tauri-apps/api/event", () => ({ listen: vi.fn(async () => vi.fn()) }));
|
|
vi.mock("@tauri-apps/plugin-opener", () => ({ openUrl: vi.fn() }));
|
|
|
|
let projects: Project[] = [];
|
|
vi.mock("../../hooks/useProjects", () => ({
|
|
useProjects: () => ({ projects }),
|
|
}));
|
|
|
|
const baseProject: Project = {
|
|
id: "p1",
|
|
name: "api-server",
|
|
paths: [{ host_path: "/src/api", mount_name: "api" }],
|
|
container_id: null,
|
|
status: "stopped",
|
|
backend: "anthropic",
|
|
bedrock_config: null,
|
|
ollama_config: null,
|
|
openai_compatible_config: null,
|
|
allow_docker_access: false,
|
|
sandbox_mode_enabled: true,
|
|
mission_control_enabled: false,
|
|
auth_bridge_enabled: false,
|
|
use_shared_auth_token: true,
|
|
full_permissions: false,
|
|
permission_mode: null,
|
|
ssh_key_path: null,
|
|
git_token: null,
|
|
git_user_name: null,
|
|
git_user_email: null,
|
|
custom_env_vars: [],
|
|
port_mappings: [],
|
|
claude_instructions: null,
|
|
claude_code_settings: null,
|
|
renamed_session_names: {},
|
|
created_at: "2026-01-01T00:00:00Z",
|
|
updated_at: "2026-01-01T00:00:00Z",
|
|
};
|
|
|
|
const running = (over: Partial<Project> = {}): Project => ({
|
|
...baseProject,
|
|
status: "running",
|
|
container_id: "container-1",
|
|
...over,
|
|
});
|
|
|
|
/** A `ClearTokenOutcome` with nothing left behind, plus any overrides. */
|
|
const outcome = (over: Partial<ClearTokenOutcome> = {}): ClearTokenOutcome => ({
|
|
snapshots_scrubbed: [],
|
|
snapshots_failed: [],
|
|
snapshots_skipped: [],
|
|
snapshots_superseded: [],
|
|
docker_unavailable: null,
|
|
...over,
|
|
});
|
|
|
|
describe("SharedAuthSettings", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
projects = [];
|
|
hasClaudeToken.mockResolvedValue(false);
|
|
sweepClaudeTokenSnapshots.mockResolvedValue(outcome());
|
|
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 />);
|
|
|
|
expect(screen.getByRole("button", { name: "Authenticate" })).toBeDisabled();
|
|
expect(screen.getByTestId("shared-auth-no-container")).toHaveTextContent(
|
|
/start a project first/i,
|
|
);
|
|
await waitFor(() => expect(hasClaudeToken).toHaveBeenCalled());
|
|
});
|
|
|
|
it("treats a running project with no container id as unusable", async () => {
|
|
projects = [running({ container_id: null })];
|
|
render(<SharedAuthSettings />);
|
|
expect(screen.getByRole("button", { name: "Authenticate" })).toBeDisabled();
|
|
await waitFor(() => expect(hasClaudeToken).toHaveBeenCalled());
|
|
});
|
|
|
|
it("enables Authenticate once a container is running", async () => {
|
|
projects = [running()];
|
|
render(<SharedAuthSettings />);
|
|
|
|
expect(screen.getByRole("button", { name: "Authenticate" })).toBeEnabled();
|
|
expect(screen.queryByTestId("shared-auth-no-container")).not.toBeInTheDocument();
|
|
await waitFor(() => expect(hasClaudeToken).toHaveBeenCalled());
|
|
});
|
|
|
|
it("offers a host picker only when more than one project is running", async () => {
|
|
projects = [running()];
|
|
const { rerender } = render(<SharedAuthSettings />);
|
|
expect(screen.queryByLabelText("Run the sign-in in")).not.toBeInTheDocument();
|
|
|
|
projects = [running(), running({ id: "p2", name: "web" })];
|
|
rerender(<SharedAuthSettings />);
|
|
expect(screen.getByLabelText("Run the sign-in in")).toBeInTheDocument();
|
|
await waitFor(() => expect(hasClaudeToken).toHaveBeenCalled());
|
|
});
|
|
|
|
it("shows Revoke only when a token is stored", async () => {
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValue(true);
|
|
render(<SharedAuthSettings />);
|
|
|
|
await screen.findByRole("button", { name: "Revoke" });
|
|
expect(screen.getByRole("button", { name: "Re-authenticate" })).toBeEnabled();
|
|
expect(screen.getByTestId("shared-auth-detail")).toHaveTextContent(
|
|
/A shared token is stored/,
|
|
);
|
|
});
|
|
|
|
it("reports a keychain read failure instead of claiming there is no token", async () => {
|
|
projects = [running()];
|
|
hasClaudeToken.mockRejectedValue("keyring backend unavailable");
|
|
render(<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.");
|
|
});
|
|
|
|
// ── A skipped scrub is not a success, and must stay retryable ────────────
|
|
// `scrub_secrets_from_snapshots` refuses a project another operation holds
|
|
// rather than racing its `:latest` tag. That leaves a live ~1-year token in
|
|
// the image, so it can be neither folded into the success message nor
|
|
// described as a permanent failure whose remedy is Reset.
|
|
|
|
it("reports a skipped snapshot as an incomplete revocation, not a success", async () => {
|
|
const toast = await revoke({
|
|
snapshots_skipped: [
|
|
"triple-c-snapshot-p1:latest: This project's container is being started or recreated. Wait for it to finish before removing a credential from its snapshot.",
|
|
],
|
|
});
|
|
expect(toast.kind).toBe("error");
|
|
expect(toast.message).toMatch(/still in 1 snapshot image/i);
|
|
expect(toast.detail).toMatch(/run the\s+cleanup again/i);
|
|
// The wrong advice for a transient refusal.
|
|
expect(toast.detail).not.toMatch(/Reset/i);
|
|
});
|
|
|
|
it("keeps a retry available after the revoke has cleared the keychain", async () => {
|
|
projects = [running()];
|
|
// Stored when the panel mounts, gone after the revoke — which is exactly
|
|
// the state that used to remove the only button able to finish the job.
|
|
hasClaudeToken.mockResolvedValueOnce(true).mockResolvedValue(false);
|
|
clearClaudeToken.mockResolvedValue({
|
|
snapshots_scrubbed: [],
|
|
snapshots_failed: [],
|
|
snapshots_skipped: ["triple-c-snapshot-p1:latest: busy"],
|
|
snapshots_superseded: [],
|
|
docker_unavailable: null,
|
|
});
|
|
render(<SharedAuthSettings />);
|
|
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke" }));
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke token" }));
|
|
|
|
const retry = await screen.findByTestId("shared-auth-retry");
|
|
await waitFor(() =>
|
|
expect(screen.queryByRole("button", { name: "Revoke" })).not.toBeInTheDocument(),
|
|
);
|
|
expect(screen.getByTestId("shared-auth-leftover")).toHaveTextContent(
|
|
/still readable/i,
|
|
);
|
|
expect(retry).toBeEnabled();
|
|
});
|
|
|
|
it("clears the warning when a retry finally finishes the job", async () => {
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValueOnce(true).mockResolvedValue(false);
|
|
clearClaudeToken.mockResolvedValueOnce({
|
|
snapshots_scrubbed: [],
|
|
snapshots_failed: [],
|
|
snapshots_skipped: ["triple-c-snapshot-p1:latest: busy"],
|
|
snapshots_superseded: [],
|
|
docker_unavailable: null,
|
|
});
|
|
render(<SharedAuthSettings />);
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke" }));
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke token" }));
|
|
const retry = await screen.findByTestId("shared-auth-retry");
|
|
|
|
sweepClaudeTokenSnapshots.mockResolvedValueOnce(
|
|
outcome({ snapshots_scrubbed: ["triple-c-snapshot-p1:latest"] }),
|
|
);
|
|
fireEvent.click(retry);
|
|
|
|
await waitFor(() =>
|
|
expect(screen.queryByTestId("shared-auth-leftover")).not.toBeInTheDocument(),
|
|
);
|
|
// One revoke, one sweep — the retry must not be a second revoke.
|
|
expect(clearClaudeToken).toHaveBeenCalledTimes(1);
|
|
expect(sweepClaudeTokenSnapshots).toHaveBeenCalledTimes(1);
|
|
const toast = useAppState.getState().toasts.at(-1)!;
|
|
expect(toast.kind).toBe("success");
|
|
expect(toast.message).toMatch(/cleared from 1 snapshot image/i);
|
|
});
|
|
|
|
it("offers a snapshot sweep even when no token is stored", async () => {
|
|
// Snapshots committed by an older build carry the token whether or not
|
|
// anything is in the keychain today, so the sweep cannot be gated on it.
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValue(false);
|
|
render(<SharedAuthSettings />);
|
|
|
|
const sweep = await screen.findByTestId("shared-auth-sweep");
|
|
expect(screen.queryByRole("button", { name: "Revoke" })).not.toBeInTheDocument();
|
|
fireEvent.click(sweep);
|
|
|
|
await waitFor(() => expect(sweepClaudeTokenSnapshots).toHaveBeenCalled());
|
|
expect(clearClaudeToken).not.toHaveBeenCalled();
|
|
const toast = useAppState.getState().toasts.at(-1)!;
|
|
expect(toast.kind).toBe("success");
|
|
expect(toast.message).toBe("No snapshot image is holding the token.");
|
|
});
|
|
|
|
it("tolerates a backend that does not report skipped snapshots", async () => {
|
|
// `snapshots_skipped` is newer than the rest of the payload; its absence
|
|
// must read as "none", never as undefined reaching the UI.
|
|
const toast = await revoke({ snapshots_scrubbed: ["triple-c-snapshot-p1:latest"] });
|
|
expect(toast.kind).toBe("success");
|
|
expect(screen.queryByTestId("shared-auth-leftover")).not.toBeInTheDocument();
|
|
});
|
|
|
|
// ── The retry must not be a revoke in disguise ───────────────────────────
|
|
// The sequence that shipped green: revoke, get a skipped image, re-authenticate
|
|
// from the button directly above the warning, then press the retry the warning
|
|
// is still offering. One command was behind both, so that press deleted the
|
|
// token acquired seconds earlier — no confirmation, and a toast that mentioned
|
|
// only images. The deliberate Revoke needs a modal; this needed nothing.
|
|
|
|
it("does not leave a stale cleanup panel over a freshly acquired token", async () => {
|
|
projects = [running()];
|
|
// Stored when the panel mounts, gone after the revoke, stored again once
|
|
// the sign-in finishes.
|
|
hasClaudeToken
|
|
.mockResolvedValueOnce(true)
|
|
.mockResolvedValueOnce(false)
|
|
.mockResolvedValue(true);
|
|
clearClaudeToken.mockResolvedValue(
|
|
outcome({ snapshots_skipped: ["triple-c-snapshot-p1:latest: busy"] }),
|
|
);
|
|
render(<SharedAuthSettings />);
|
|
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke" }));
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke token" }));
|
|
await screen.findByTestId("shared-auth-leftover");
|
|
|
|
// Re-authenticate from the button above the warning.
|
|
fireEvent.click(await screen.findByRole("button", { name: "Authenticate" }));
|
|
fireEvent.click(await screen.findByRole("button", { name: "finish sign-in" }));
|
|
|
|
await screen.findByRole("button", { name: "Revoke" });
|
|
expect(screen.queryByTestId("shared-auth-leftover")).not.toBeInTheDocument();
|
|
expect(screen.queryByTestId("shared-auth-retry")).not.toBeInTheDocument();
|
|
|
|
// The images can still be cleaned up — and doing so does not spend the new
|
|
// token.
|
|
fireEvent.click(screen.getByTestId("shared-auth-sweep"));
|
|
await waitFor(() => expect(sweepClaudeTokenSnapshots).toHaveBeenCalled());
|
|
expect(clearClaudeToken).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("sends the retry to the sweep-only command, never to the revoke", async () => {
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValueOnce(true).mockResolvedValue(false);
|
|
clearClaudeToken.mockResolvedValue(
|
|
outcome({ snapshots_skipped: ["triple-c-snapshot-p1:latest: busy"] }),
|
|
);
|
|
sweepClaudeTokenSnapshots.mockResolvedValue(
|
|
outcome({ snapshots_skipped: ["triple-c-snapshot-p1:latest: busy"] }),
|
|
);
|
|
render(<SharedAuthSettings />);
|
|
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke" }));
|
|
fireEvent.click(await screen.findByRole("button", { name: "Revoke token" }));
|
|
const retry = await screen.findByTestId("shared-auth-retry");
|
|
|
|
fireEvent.click(retry);
|
|
await waitFor(() => expect(sweepClaudeTokenSnapshots).toHaveBeenCalledTimes(1));
|
|
fireEvent.click(await screen.findByTestId("shared-auth-retry"));
|
|
await waitFor(() => expect(sweepClaudeTokenSnapshots).toHaveBeenCalledTimes(2));
|
|
|
|
// However many times it is pressed, the keychain is touched exactly once —
|
|
// by the revoke the user confirmed.
|
|
expect(clearClaudeToken).toHaveBeenCalledTimes(1);
|
|
// …and a retry that still finds a busy project says so without ever
|
|
// claiming a token was removed.
|
|
const toast = useAppState.getState().toasts.at(-1)!;
|
|
expect(toast.message).not.toMatch(/keychain/i);
|
|
});
|
|
|
|
it("will not start a sign-in while a cleanup is still running", async () => {
|
|
// A sweep is a per-image inspect/create/commit/rmi over the Docker socket
|
|
// and runs for minutes. Acquiring a token inside that window races the
|
|
// rewrite that is meant to be removing one.
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValue(false);
|
|
sweepClaudeTokenSnapshots.mockReturnValue(new Promise(() => {}));
|
|
render(<SharedAuthSettings />);
|
|
|
|
const authenticate = await screen.findByRole("button", { name: "Authenticate" });
|
|
expect(authenticate).toBeEnabled();
|
|
|
|
fireEvent.click(await screen.findByTestId("shared-auth-sweep"));
|
|
await waitFor(() =>
|
|
expect(screen.getByRole("button", { name: "Authenticate" })).toBeDisabled(),
|
|
);
|
|
});
|
|
|
|
// ── A keychain that refuses the delete has to leave something to press ───
|
|
|
|
it("keeps both remedies on screen when the keychain refuses the delete", async () => {
|
|
projects = [running()];
|
|
hasClaudeToken.mockResolvedValue(true);
|
|
clearClaudeToken.mockRejectedValue("the keychain is locked");
|
|
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),
|
|
);
|
|
const toast = useAppState.getState().toasts[0];
|
|
expect(toast.kind).toBe("error");
|
|
expect(toast.detail).toMatch(/still stored/i);
|
|
|
|
// The token is still there, so Revoke is still the retry for it — and the
|
|
// images, which the failed delete says nothing about, have their own sweep.
|
|
await screen.findByRole("button", { name: "Revoke" });
|
|
const sweep = screen.getByTestId("shared-auth-sweep");
|
|
fireEvent.click(sweep);
|
|
await waitFor(() => expect(sweepClaudeTokenSnapshots).toHaveBeenCalled());
|
|
});
|
|
});
|