From 9c28f3c4c0840fd7424dc669db1fb9baa1dde5d7 Mon Sep 17 00:00:00 2001 From: Rudy Mizrahi Celekli <47457359+rudycelekli@users.noreply.github.com> Date: Mon, 5 Oct 2026 02:58:14 -0400 Subject: [PATCH] fix(browser): keep subresource redirects out of page navigation scope (#524) Signed-off-by: RudyCelekli <47457359+rudycelekli@users.noreply.github.com> --- src/browser/CdpObservationSession.ts | 2 + .../cdpObservationResourceTypes.test.ts | 57 +++++++++++++++++++ tests/fixtures/fakeCdpBrowserEvents.ts | 1 + tests/fixtures/fakeCdpBrowserTypes.ts | 1 + 4 files changed, 61 insertions(+) create mode 100644 tests/boundary/browser/cdpObservationResourceTypes.test.ts diff --git a/src/browser/CdpObservationSession.ts b/src/browser/CdpObservationSession.ts index 60e26e110..fe250e85f 100644 --- a/src/browser/CdpObservationSession.ts +++ b/src/browser/CdpObservationSession.ts @@ -266,6 +266,8 @@ class TimelineCapture { } #redirect(params: UnknownRecord): void { + const resourceType = stringValue(params.type); + if (resourceType !== undefined && resourceType !== "Document") return; if ( stringValue(params.frameId) !== this.mainFrameId || recordValue(params.redirectResponse) === undefined diff --git a/tests/boundary/browser/cdpObservationResourceTypes.test.ts b/tests/boundary/browser/cdpObservationResourceTypes.test.ts new file mode 100644 index 000000000..f7c97d3dd --- /dev/null +++ b/tests/boundary/browser/cdpObservationResourceTypes.test.ts @@ -0,0 +1,57 @@ +import { expect, it, onTestFinished } from "vitest"; + +import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js"; +import { observeWebSessionInputSchema } from "../../../src/domain/browserSession.js"; +import { startFakeCdpBrowser } from "../../fixtures/fakeCdpBrowser.js"; + +it.each(["Fetch", "Script"] as const)( + "does not treat a %s redirect as leaving the observed page", + async (type) => { + const browser = await startFakeCdpBrowser({ + sessionTimeline: "outside_policy", + sessionRedirectResourceType: type, + }); + onTestFinished(async () => { + await browser.close(); + }); + const result = await new CdpBrowserProvider().observeSession( + observeWebSessionInputSchema.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.window.end_reason).toBe("window_elapsed"); + expect(result.value.timeline.some(({ type }) => type === "redirect")).toBe( + false, + ); + }, +); + +it.each(["Document", undefined] as const)( + "retains outside-origin scope rejection for %s redirect metadata", + async (type) => { + const browser = await startFakeCdpBrowser({ + sessionTimeline: "outside_policy", + ...(type === undefined ? {} : { sessionRedirectResourceType: type }), + }); + onTestFinished(async () => { + await browser.close(); + }); + const result = await new CdpBrowserProvider().observeSession( + observeWebSessionInputSchema.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.window.end_reason).toBe("target_left_scope"); + expect(result.value.timeline.some(({ type }) => type === "redirect")).toBe( + true, + ); + }, +); diff --git a/tests/fixtures/fakeCdpBrowserEvents.ts b/tests/fixtures/fakeCdpBrowserEvents.ts index 8f1b8e49a..b6c711714 100644 --- a/tests/fixtures/fakeCdpBrowserEvents.ts +++ b/tests/fixtures/fakeCdpBrowserEvents.ts @@ -160,6 +160,7 @@ const emitSessionTimeline = ( : `http://127.0.0.1:${String(port)}/redirected?token=redirect-secret`; event(socket, "Network.requestWillBeSent", command.sessionId, { requestId: "document-request", + type: options.sessionRedirectResourceType, frameId: "frame-main", loaderId: "loader-redirect", request: { url: redirectUrl, method: "GET" }, diff --git a/tests/fixtures/fakeCdpBrowserTypes.ts b/tests/fixtures/fakeCdpBrowserTypes.ts index d26d71ea8..35b1a9f17 100644 --- a/tests/fixtures/fakeCdpBrowserTypes.ts +++ b/tests/fixtures/fakeCdpBrowserTypes.ts @@ -54,6 +54,7 @@ export interface FakeOptions { | "outside_policy" | "target_detached"; readonly sessionTimelineEventCount?: number; + readonly sessionRedirectResourceType?: "Document" | "Fetch" | "Script"; readonly closeAfterMethod?: string; readonly sensitiveShapes?: boolean; readonly cachedResponseBody?: string;