diff --git a/src/browser/CdpSafeMetadata.test.ts b/src/browser/CdpSafeMetadata.test.ts index e9fb87b5f7..89f812316e 100644 --- a/src/browser/CdpSafeMetadata.test.ts +++ b/src/browser/CdpSafeMetadata.test.ts @@ -430,157 +430,160 @@ describe("safe CDP response metadata CSP sources", () => { }); }); -describe("Link header value delimiters", () => { - const captureLinks = (link: string) => - safeResponseMetadata( - "owned", - "https://owned.test/page", +const captureOwnedLinks = (link: string) => + safeResponseMetadata( + "owned", + "https://owned.test/page", + { + headers: { Link: link }, + }, + new Set(["https://owned.test"]), + ).response.links; + +it("retains declarations and untrusted hints across comma, LF, and CRLF field boundaries", () => { + const separators = [ + ["comma", ", "], + ["lf", "\n"], + ["crlf", "\r\n"], + ] as const; + const link = separators + .map( + ([id, separator]) => + `; rel="preload"; type="text/javascript; charset=utf-8"; title="a,b"${separator}; rel="mcp service-desc"`, + ) + .join("\n"); + const { response, agentHints } = safeResponseMetadata( + "document-response", + `${origin}/page`, + { headers: { Link: link } }, + new Set([origin]), + ); + + expect(response.links).toMatchObject( + separators.flatMap(([id]) => [ { - headers: { Link: link }, + href: `${origin}/assets/${id},blue.js`, + rel: ["preload"], + type: "text/javascript; charset=utf-8", }, - new Set(["https://owned.test"]), - ).response.links; - - it.each([", ", "\n", "\r\n"])( - "preserves repeated field declarations and agent hints joined by %j", - (separator) => { - const captured = safeResponseMetadata( - "document-response", - `${origin}/page`, - { - headers: { - Link: [ - '; rel="preload"; type="text/javascript; charset=utf-8"; title="a,b"', - '; rel="mcp service-desc"', - ].join(separator), - }, - }, - new Set([origin]), - ); - expect(captured.response.links).toMatchObject([ - { - href: `${origin}/assets/red,blue.js`, - rel: ["preload"], - type: "text/javascript; charset=utf-8", - }, - { - href: `${origin}/agent?selected=keep`, - rel: ["mcp", "service-desc"], - }, - ]); - expect(captured.agentHints).toContainEqual({ - mechanism: "link_rel", - declaration: "mcp service-desc", - url: `${origin}/agent?selected=keep`, - trust: "page-declared-untrusted", - }); - }, + { + href: `${origin}/${id}/agent?selected=keep`, + rel: ["mcp", "service-desc"], + }, + ]), ); - - it.each(["\u00a0", "\u000b", "\u000c", "\u2003", "\ufeff"])( - "preserves non-HTTP whitespace %j without inventing agent relations", - (separator) => { - for (const declaration of [ - `"alternate${separator}mcp"`, - `${separator}mcp${separator}`, - `"${separator}mcp${separator}"`, - ]) { - const captured = safeResponseMetadata( - "owned", - "https://owned.test/page", - { headers: { Link: `; rel=${declaration}` } }, - new Set(["https://owned.test"]), - ); - expect(captured.response.links[0]?.rel).toEqual([ - declaration.replace(/^"|"$/gu, ""), - ]); - expect(captured.agentHints).toEqual([]); - } - }, - ); - - it("does not trim non-HTTP whitespace into link or parameter syntax", () => { - expect(captureLinks("\u00a0; rel=mcp")).toEqual([]); - const links = captureLinks( - "; \u00a0rel=mcp; rel\u00a0=service-desc", - ); - expect(links[0]?.rel).toEqual([]); - }); - - it("uses HTTP spaces and tabs for relation and parameter boundaries", () => { - const captured = safeResponseMetadata( - "owned", - "https://owned.test/page", - { headers: { Link: '\t; \trel\t=\t" MCP\t service-desc "\t' } }, - new Set(["https://owned.test"]), - ); - expect(captured.response.links[0]?.rel).toEqual(["mcp", "service-desc"]); - expect(captured.agentHints).toContainEqual({ + expect(agentHints).toEqual( + separators.map(([id]) => ({ mechanism: "link_rel", declaration: "mcp service-desc", - url: "https://owned.test/agent", + url: `${origin}/${id}/agent?selected=keep`, trust: "page-declared-untrusted", - }); - }); + })), + ); +}); - it("keeps delimiters scoped to each CDP field line", () => { - const links = captureLinks( - '; title="unterminated\n; rel=mcp', - ); - expect(links.map(({ href }) => href)).toEqual([ - "https://owned.test/first", - "https://owned.test/agent", - ]); - expect(links[1]?.rel).toEqual(["mcp"]); - }); +it("keeps non-HTTP whitespace inside relation tokens", () => { + const relations = ["\u00a0", "\u000b", "\u000c", "\u2003", "\ufeff"].flatMap( + (separator) => [ + [`"alternate${separator}mcp"`, `alternate${separator}mcp`], + [`${separator}mcp${separator}`, `${separator}mcp${separator}`], + [`"${separator}mcp${separator}"`, `${separator}mcp${separator}`], + ], + ); + const { response, agentHints } = safeResponseMetadata( + "owned", + "https://owned.test/page", + { + headers: { + Link: relations + .map( + ([declaration], index) => + `; rel=${declaration}`, + ) + .join("\n"), + }, + }, + new Set(["https://owned.test"]), + ); + expect(response.links).toMatchObject( + relations.map(([, token], index) => ({ + href: `https://owned.test/agent/${String(index)}`, + rel: [token], + })), + ); + expect(agentHints).toEqual([]); +}); - it("preserves commas in URI references and separates later links", () => { - const links = captureLinks( - '; rel="preload"; as=script, ; rel="modulepreload"', - ); - expect(links.map(({ href }) => href)).toEqual([ - "https://owned.test/assets/red,blue.js", - "https://owned.test/ordinary.js", - ]); - expect(links[0]?.as).toBe("script"); - }); +it("does not trim non-HTTP whitespace into link or parameter syntax", () => { + expect(captureOwnedLinks("\u00a0; rel=mcp")).toEqual([]); + const links = captureOwnedLinks( + "; \u00a0rel=mcp; rel\u00a0=service-desc", + ); + expect(links[0]?.rel).toEqual([]); +}); - it("preserves semicolons and commas inside quoted parameter values", () => { - const links = captureLinks( - '; rel="preload"; type="text/javascript; charset=utf-8"; title="a,b", ; rel="modulepreload"', - ); - expect(links).toHaveLength(2); - expect(links[0]?.type).toBe("text/javascript; charset=utf-8"); - expect(links[1]?.href).toBe("https://owned.test/ordinary.js"); - }); - - it("counts quoted-pair escapes rather than treating every preceding slash as an escape", () => { - const links = captureLinks( - String.raw`; title="ends with \\"; rel="preload", ; rel="modulepreload"`, - ); - expect(links.map(({ href }) => href)).toEqual([ - "https://owned.test/one.js", - "https://owned.test/two.js", - ]); - expect(links[0]?.rel).toEqual(["preload"]); - }); - - it("keeps a quoted escaped quote from exposing a delimiter", () => { - const links = captureLinks( - String.raw`; title="quoted \" comma, value"; rel="preload", ; rel="modulepreload"`, - ); - expect(links).toHaveLength(2); - expect(links[0]?.rel).toEqual(["preload"]); - }); - - it("retains the existing outside-policy classification", () => { - const links = captureLinks( - '; rel="preload", ; rel="modulepreload"', - ); - expect(links[0]?.destination_scope).toBe("outside_policy"); - expect(links[1]?.destination_scope).toBe("approved"); +it("uses HTTP spaces and tabs for relation and parameter boundaries", () => { + const captured = safeResponseMetadata( + "owned", + "https://owned.test/page", + { headers: { Link: '\t; \trel\t=\t" MCP\t service-desc "\t' } }, + new Set(["https://owned.test"]), + ); + expect(captured.response.links[0]?.rel).toEqual(["mcp", "service-desc"]); + expect(captured.agentHints).toContainEqual({ + mechanism: "link_rel", + declaration: "mcp service-desc", + url: "https://owned.test/agent", + trust: "page-declared-untrusted", }); }); + +it("keeps delimiters scoped to each CDP field line", () => { + const links = captureOwnedLinks( + '; title="unterminated\n; rel=mcp', + ); + expect(links.map(({ href }) => href)).toEqual([ + "https://owned.test/first", + "https://owned.test/agent", + ]); + expect(links[1]?.rel).toEqual(["mcp"]); +}); + +it("preserves URI and quoted delimiters without merging neighboring links", () => { + const links = captureOwnedLinks( + [ + '; rel="preload"; as=script', + '; rel="preload"; type="text/javascript; charset=utf-8"; title="a,b"', + String.raw`; title="ends with \\"; rel="preload"`, + String.raw`; title="quoted \" comma, value"; rel="preload"`, + '; rel="preload"', + '; rel="modulepreload"', + ].join(", "), + ); + expect(links).toMatchObject([ + { + href: "https://owned.test/assets/red,blue.js", + as: "script", + rel: ["preload"], + }, + { + href: "https://owned.test/plugin.js", + type: "text/javascript; charset=utf-8", + }, + { href: "https://owned.test/paired-slash.js", rel: ["preload"] }, + { href: "https://owned.test/escaped-quote.js", rel: ["preload"] }, + { + href: "https://elsewhere.test/red,blue.js", + destination_scope: "outside_policy", + }, + { + href: "https://owned.test/ordinary.js", + rel: ["modulepreload"], + destination_scope: "approved", + }, + ]); +}); + describe("safe CDP response metadata referrer policy", () => { it.each<[string | undefined, string | null]>([ [ diff --git a/tests/boundary/browser/cdpBrowserProvider.network.test.ts b/tests/boundary/browser/cdpBrowserProvider.network.test.ts index 5859f4960f..adadb6de99 100644 --- a/tests/boundary/browser/cdpBrowserProvider.network.test.ts +++ b/tests/boundary/browser/cdpBrowserProvider.network.test.ts @@ -10,82 +10,6 @@ import { } from "../../fixtures/fakeCdpBrowser.js"; import { trackBrowser } from "./cdpBrowserProvider.support.js"; -it("preserves Document Link fields, structured policies and derived agent hints", async () => { - const browser = await startFakeCdpBrowser({ - commandEvents(command, origin) { - if (command.method !== "Network.enable") return undefined; - const session = - command.sessionId === undefined ? {} : { sessionId: command.sessionId }; - return [ - { - ...session, - method: "Network.requestWillBeSent", - params: { - requestId: "repeated-document", - type: "Document", - request: { url: `${origin}/frame`, method: "GET" }, - initiator: { type: "parser" }, - }, - }, - { - ...session, - method: "Network.responseReceived", - params: { - requestId: "repeated-document", - type: "Document", - response: { - url: `${origin}/frame`, - status: 200, - mimeType: "text/html", - headers: { - Link: "; rel=next\n; rel=mcp", - "Cross-Origin-Opener-Policy": 'same-origin; report-to="coop"', - "Cross-Origin-Embedder-Policy": - 'require-corp; report-to="coep"', - }, - }, - }, - }, - ]; - }, - }); - trackBrowser(browser); - const result = await new CdpBrowserProvider().inspectPage( - inspectWebPageInputSchema.parse({ - cdp_endpoint: browser.endpoint, - allowed_origins: [browser.allowedOrigin], - target_id: "allowed-page", - observation_ms: 1, - }), - ); - if (!result.ok) throw result.error; - expect(result.value.metadata.responses).toContainEqual( - expect.objectContaining({ - request_id: "repeated-document", - policies: expect.objectContaining({ - coop: "same-origin", - coep: "require-corp", - }), - links: [ - expect.objectContaining({ - href: `${browser.allowedOrigin}/next`, - rel: ["next"], - }), - expect.objectContaining({ - href: `${browser.allowedOrigin}/agent`, - rel: ["mcp"], - }), - ], - }), - ); - expect(result.value.metadata.agent_hints).toContainEqual({ - mechanism: "link_rel", - declaration: "mcp", - url: `${browser.allowedOrigin}/agent`, - trust: "page-declared-untrusted", - }); -}); - const inspectResponseBodies = async (options: FakeOptions) => { const browser = await startFakeCdpBrowser({ eventsBeforeReply: ["Network.enable", "Network.getResponseBody"], diff --git a/tests/boundary/mcp/browserMcp.test.ts b/tests/boundary/mcp/browserMcp.test.ts index b955b948a8..cefa90686b 100644 --- a/tests/boundary/mcp/browserMcp.test.ts +++ b/tests/boundary/mcp/browserMcp.test.ts @@ -30,6 +30,7 @@ import { createTestMcp } from "../../support/mcp/mcpFixture.js"; import { startFakeCdpBrowser, type FakeCdpBrowser, + type FakeOptions, } from "../../fixtures/fakeCdpBrowser.js"; const schemaValidation = createMcpSchemaValidation(); @@ -48,7 +49,10 @@ afterAll(async () => { } }); -it("preserves Link parameter order and context through the advertised MCP contract", async () => { +const linkMetadataEvents: NonNullable = ( + command, + origin, +) => { const links = [ '; rel="mcp"; rel="preload"; type="application/mcp"; type="application/preload"', '; rel="preload"; rel="mcp"', @@ -57,44 +61,48 @@ it("preserves Link parameter order and context through the advertised MCP contra '; rel="mcp"', '; rel="mcp"; anchor="/page"', ]; + if (command.method !== "Network.enable") return undefined; + const session = + command.sessionId === undefined ? {} : { sessionId: command.sessionId }; + return [ + { + ...session, + method: "Network.requestWillBeSent", + params: { + requestId: "link-metadata", + type: "Document", + request: { url: `${origin}/page`, method: "GET" }, + initiator: { type: "parser" }, + }, + }, + { + ...session, + method: "Network.responseReceived", + params: { + requestId: "link-metadata", + type: "Document", + response: { + url: `${origin}/page`, + status: 200, + mimeType: "text/html", + headers: { + Link: [ + links.join(", "), + `; rel="mcp"; anchor="${new URL(origin).protocol}//other-user:other-pass@${new URL(origin).host}/page"`, + ].join("\n"), + "Cross-Origin-Opener-Policy": 'same-origin; report-to="coop"', + "Cross-Origin-Embedder-Policy": 'require-corp; report-to="coep"', + }, + }, + }, + }, + ]; +}; + +it("preserves response header facts and Link context through the advertised MCP contract", async () => { const browser = await startFakeCdpBrowser({ eventsBeforeReply: ["Network.enable"], - commandEvents(command, origin) { - if (command.method !== "Network.enable") return undefined; - const session = - command.sessionId === undefined ? {} : { sessionId: command.sessionId }; - return [ - { - ...session, - method: "Network.requestWillBeSent", - params: { - requestId: "link-metadata", - type: "Document", - request: { url: `${origin}/page`, method: "GET" }, - initiator: { type: "parser" }, - }, - }, - { - ...session, - method: "Network.responseReceived", - params: { - requestId: "link-metadata", - type: "Document", - response: { - url: `${origin}/page`, - status: 200, - mimeType: "text/html", - headers: { - Link: [ - ...links, - `; rel="mcp"; anchor="${new URL(origin).protocol}//other-user:other-pass@${new URL(origin).host}/page"`, - ].join(", "), - }, - }, - }, - }, - ]; - }, + commandEvents: linkMetadataEvents, }); retainBrowser(browser); const connected = await connectBrowser(); @@ -127,6 +135,10 @@ it("preserves Link parameter order and context through the advertised MCP contra expect(normalized.metadata.responses).toContainEqual( expect.objectContaining({ request_id: "link-metadata", + policies: expect.objectContaining({ + coop: "same-origin", + coep: "require-corp", + }), links: [ expect.objectContaining({ href: `${browser.allowedOrigin}/duplicate-first`, @@ -172,12 +184,16 @@ it("preserves Link parameter order and context through the advertised MCP contra const linkHints = normalized.metadata.agent_hints.filter( ({ mechanism }) => mechanism === "link_rel", ); - expect(linkHints.map(({ url }) => url)).toEqual([ - `${browser.allowedOrigin}/duplicate-first`, - `${browser.allowedOrigin}/escaped-rel`, - `${browser.allowedOrigin}/default-context`, - `${browser.allowedOrigin}/same-context`, - ]); + expect(linkHints).toEqual( + ["duplicate-first", "escaped-rel", "default-context", "same-context"].map( + (path) => ({ + mechanism: "link_rel", + declaration: "mcp", + trust: "page-declared-untrusted", + url: `${browser.allowedOrigin}/${path}`, + }), + ), + ); const contextless = structuredClone(normalized) as unknown as { metadata: { responses: { links: Record[] }[] };