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,10 +1,12 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import {
|
||||
ANTHROPIC_SIGN_IN_HOSTS,
|
||||
MAX_RELAY_URL_LENGTH,
|
||||
RelayRateLimiter,
|
||||
URL_RELAY_OSC,
|
||||
parseUrlRelayOsc,
|
||||
sanitizeRelayUrl,
|
||||
urlOrigin,
|
||||
} from "./urlRelay";
|
||||
|
||||
/** Build the OSC 7777 payload the container shim emits for `url`. */
|
||||
@@ -153,6 +155,86 @@ describe("sanitizeRelayUrl — rejects malformed and hostile input", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("sanitizeRelayUrl — quote characters", () => {
|
||||
// Latent today, because the only path that would exploit it is behind a
|
||||
// feature flag. Latent is not the same as absent: the character class is the
|
||||
// thing standing between a container-supplied string and an OS opener that
|
||||
// on Windows has historically been reached through a command interpreter.
|
||||
it("rejects a double quote", () => {
|
||||
expect(sanitizeRelayUrl('https://example.com/a"b')).toBeNull();
|
||||
expect(sanitizeRelayUrl('https://example.com/?q="&x=1')).toBeNull();
|
||||
});
|
||||
|
||||
it("rejects a single quote and a backtick", () => {
|
||||
expect(sanitizeRelayUrl("https://example.com/a'b")).toBeNull();
|
||||
expect(sanitizeRelayUrl("https://example.com/a`b")).toBeNull();
|
||||
});
|
||||
|
||||
it("still accepts the percent-encoded forms", () => {
|
||||
expect(sanitizeRelayUrl("https://example.com/a%22b")).toBe(
|
||||
"https://example.com/a%22b",
|
||||
);
|
||||
});
|
||||
|
||||
it("rejects C1 controls and exotic whitespace new URL() would keep", () => {
|
||||
expect(sanitizeRelayUrl("https://example.com/a\u0085b")).toBeNull();
|
||||
expect(sanitizeRelayUrl("https://example.com/a\u00a0b")).toBeNull();
|
||||
expect(sanitizeRelayUrl("https://example.com/a\u3000b")).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe("sanitizeRelayUrl — host allowlist", () => {
|
||||
const opts = { allowHosts: ANTHROPIC_SIGN_IN_HOSTS };
|
||||
|
||||
it("accepts the domain itself and its subdomains", () => {
|
||||
expect(sanitizeRelayUrl("https://claude.ai/oauth/authorize", opts)).toBe(
|
||||
"https://claude.ai/oauth/authorize",
|
||||
);
|
||||
expect(
|
||||
sanitizeRelayUrl("https://platform.claude.com/oauth/code/callback", opts),
|
||||
).toBe("https://platform.claude.com/oauth/code/callback");
|
||||
});
|
||||
|
||||
it("rejects a lookalike that merely contains the domain", () => {
|
||||
expect(sanitizeRelayUrl("https://claude.ai.evil.tld/oauth", opts)).toBeNull();
|
||||
expect(sanitizeRelayUrl("https://notclaude.ai/oauth", opts)).toBeNull();
|
||||
expect(sanitizeRelayUrl("https://evil.tld/claude.ai/oauth", opts)).toBeNull();
|
||||
});
|
||||
|
||||
it("rejects the userinfo spoof even though it reads as an allowed host", () => {
|
||||
expect(
|
||||
sanitizeRelayUrl("https://claude.ai@evil.tld/oauth/authorize", opts),
|
||||
).toBeNull();
|
||||
});
|
||||
|
||||
it("is case-insensitive about the host", () => {
|
||||
expect(sanitizeRelayUrl("https://CLAUDE.AI/oauth", opts)).toBe(
|
||||
"https://claude.ai/oauth",
|
||||
);
|
||||
});
|
||||
|
||||
it("allows any host when no allowlist is given — the relay's whole point", () => {
|
||||
expect(sanitizeRelayUrl("https://github.com/login/device")).toBe(
|
||||
"https://github.com/login/device",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("urlOrigin", () => {
|
||||
it("returns the part that decides where credentials go", () => {
|
||||
expect(urlOrigin("https://claude.ai/oauth/authorize?code=true")).toBe(
|
||||
"https://claude.ai",
|
||||
);
|
||||
expect(urlOrigin("http://127.0.0.1:41703/callback")).toBe(
|
||||
"http://127.0.0.1:41703",
|
||||
);
|
||||
});
|
||||
|
||||
it("returns null rather than guessing at unparseable input", () => {
|
||||
expect(urlOrigin("not a url")).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe("parseUrlRelayOsc", () => {
|
||||
it("decodes the sequence the container shim emits", () => {
|
||||
const url = "https://github.com/login/device";
|
||||
|
||||
Reference in New Issue
Block a user