Skip to content

web: de-flake fetchTracking redaction test (#1757) #1759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cliffhall merged 1 commit into from
Jul 24, 2026
Merged

web: de-flake fetchTracking redaction test (#1757) #1759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions clients/web/src/test/core/mcp/fetchTracking.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,21 @@ function lowerKeys(
return out;
}

// Serialize a recorded entry MINUS its volatile `id` for whole-entry
// secret-leak assertions. The tracker mints `id` as
// `${timestamp}-${Math.random().toString(36)…}` (see fetchTracking.ts), so its
// random base36 tail can coincidentally contain a short secret substring (e.g.
// the base36 id `…sw7kshhf0` contains "shh"), which would fail a naive
// `JSON.stringify(entry).not.toContain(secret)` even though redaction worked.
// The `id` is generated independently of any secret and can never legitimately
// carry one, so excluding it keeps the leak check meaningful and deterministic
// while every other (deterministic) field is still checked.
function serializedWithoutId(entry: FetchRequestEntryBase): string {
// Overwriting `id` with `undefined` drops it from the JSON (stringify omits
// undefined-valued keys) without an unused destructured binding.
return JSON.stringify({ ...entry, id: undefined });
}

describe("createFetchTracker", () => {
it("tracks a successful GET request and emits the response body asynchronously", async () => {
const baseFetch = vi.fn(
Expand Down Expand Up @@ -308,9 +323,11 @@ describe("createFetchTracker", () => {
expect(headers["x-api-key"]).toBe(REDACTED_HEADER_VALUE);
expect(headers["x-mcp-remote-auth"]).toBe(REDACTED_HEADER_VALUE);
expect(headers["x-custom"]).toBe("kept");
expect(JSON.stringify(tracked[0])).not.toContain("live-access-token");
expect(JSON.stringify(tracked[0])).not.toContain("session=secret");
expect(JSON.stringify(tracked[0])).not.toContain("inspector-backend-token");
expect(serializedWithoutId(tracked[0]!)).not.toContain("live-access-token");
expect(serializedWithoutId(tracked[0]!)).not.toContain("session=secret");
expect(serializedWithoutId(tracked[0]!)).not.toContain(
"inspector-backend-token",
);
// The actual outbound request still carries the live token — redaction is
// only for the recorded entry.
expect(new Headers(outboundInit?.headers).get("authorization")).toBe(
Expand All @@ -334,7 +351,7 @@ describe("createFetchTracker", () => {
expect(lowerKeys(tracked[0]!.requestHeaders)["authorization"]).toBe(
REDACTED_HEADER_VALUE,
);
expect(JSON.stringify(tracked[0])).not.toContain("leaked-on-error");
expect(serializedWithoutId(tracked[0]!)).not.toContain("leaked-on-error");
});

it("redacts sensitive response headers in the recorded entry", async () => {
Expand All @@ -359,7 +376,7 @@ describe("createFetchTracker", () => {
const responseHeaders = lowerKeys(tracked[0]!.responseHeaders);
expect(responseHeaders["x-api-key"]).toBe(REDACTED_HEADER_VALUE);
expect(responseHeaders["content-type"]).toBe("text/plain");
expect(JSON.stringify(tracked[0])).not.toContain("issued-secret");
expect(serializedWithoutId(tracked[0]!)).not.toContain("issued-secret");
});

it("redacts a form-encoded OAuth token request body without touching the live request", async () => {
Expand Down Expand Up @@ -387,9 +404,9 @@ describe("createFetchTracker", () => {
expect(recorded.get("code_verifier")).toBe(REDACTED_VALUE);
expect(recorded.get("grant_type")).toBe("authorization_code");
expect(recorded.get("client_id")).toBe("public");
expect(JSON.stringify(tracked[0])).not.toContain("secret-auth-code");
expect(JSON.stringify(tracked[0])).not.toContain("shh");
expect(JSON.stringify(tracked[0])).not.toContain("pkce123");
expect(serializedWithoutId(tracked[0]!)).not.toContain("secret-auth-code");
expect(serializedWithoutId(tracked[0]!)).not.toContain("shh");
expect(serializedWithoutId(tracked[0]!)).not.toContain("pkce123");
// The live outbound request body is byte-identical.
expect(outboundInit?.body).toBe(liveBody);
});
Expand Down Expand Up @@ -501,7 +518,7 @@ describe("createFetchTracker", () => {
expect(JSON.parse(tracked[0]!.requestBody!)).toEqual({
params: { arguments: { access_token: REDACTED_VALUE, page: 2 } },
});
expect(JSON.stringify(tracked[0])).not.toContain("sekret");
expect(serializedWithoutId(tracked[0]!)).not.toContain("sekret");
// The live outbound request body is byte-identical (unredacted).
expect(outboundInit?.body).toBe(liveBody);
});
Expand Down
Loading