fix(browser): keep subresource redirects out of page navigation scope (#524)
Signed-off-by: RudyCelekli <47457359+rudycelekli@users.noreply.github.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
);
|
||||
},
|
||||
);
|
||||
+1
@@ -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" },
|
||||
|
||||
+1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user