Skip to content

Chrome DevTools for coding agents

feat: add abort and allow-origin network mocks (#3421)

Marco Pronteraeb4b53d1621b
diff --git a/docs/tool-reference.md b/docs/tool-reference.md
index e3bdea0d..42d60d1b 100644
--- a/docs/tool-reference.md
+++ b/docs/tool-reference.md
@@ -726,11 +726,13 @@ in the DevTools Elements panel (if any).
### `mock_network`
-**Description:** Inspect or update network mocks for a page. With no actions, list mocks matching the supplied filters, or all mocks when no filters are given. Providing body or upstream updates the exact route/resourceType pair. An omitted route matches any URL. Other mocks are preserved. The most recently updated matching mock wins and persists across navigations. Configure before navigating or reloading; inspection shows hit counts and replacement errors. Upstream responses use server-side GET/HEAD fetches. Changes are rejected during a performance trace. Mocks disable the page HTTP cache and intercept every request, affecting measurements. Service workers can bypass mocks. Use [`remove_network_mock`](#remove_network_mock) to remove mocks. (requires flag: --categoryNetworkMocks=true)
+**Description:** Inspect or update network mocks for a page. With no actions, list mocks matching the supplied filters, or all mocks when no filters are given. Providing abort (including false), allowOrigin, body, or upstream updates the exact route/resourceType pair; omitted actions keep existing settings. Remove and recreate a mock to clear its source or allowOrigin. An omitted route matches any URL. Other mocks are preserved. abort=true suppresses its response and allowOrigin header. The most recently updated matching mock wins and persists across navigations. Configure before navigating or reloading; inspection shows hit counts and replacement errors. allowOrigin requires a body or upstream source. Upstream responses use server-side GET/HEAD fetches. Changes are rejected during a performance trace. Mocks disable the page HTTP cache and intercept every request, affecting measurements. Service workers can bypass mocks. Use [`remove_network_mock`](#remove_network_mock) to remove mocks. (requires flag: --categoryNetworkMocks=true)
**Parameters:**
- **pageId** (number) **(required)**: Targets a specific page by ID.
+- **abort** (boolean) _(optional)_: Abort matching requests when true. When false, use the stored body or upstream source, or send the request to the network if neither is set. A mock without a source still wins over older matching mocks. Abortion takes precedence over body, upstream, and allowOrigin.
+- **allowOrigin** (string) _(optional)_: Set the Access-Control-Allow-Origin response header to `*`, `null`, or a serialized origin such as https://example.com. Requires body or upstream, either supplied now or already set on the mock. This does not configure preflight or credential headers.
- **body** (string) _(optional)_: Local response body file, revalidated and reread for every request. Content-Type follows its extension. Mutually exclusive with upstream.
- **resourceType** (enum: "document", "stylesheet", "image", "media", "font", "script", "texttrack", "xhr", "fetch", "prefetch", "eventsource", "manifest", "signedexchange", "ping", "cspviolationreport", "preflight", "fedcm", "other") _(optional)_: Restrict requests and stored mock filters to this resource type. Omit to inspect/remove all types or configure a mock for any type.
- **route** (string) _(optional)_: Absolute URLPattern, e.g. https://example.com/app.js or `*://*:*/app.js`. Use `*` for wildcards; omitted query strings match any query. Regex and `:name` groups are rejected. Inspection and removal compare the stored pattern exactly. Omit to inspect/remove all routes or match any URL.
diff --git a/src/NetworkOverrideManager.ts b/src/NetworkOverrideManager.ts
index 0db2b1b1..37a8b96f 100644
--- a/src/NetworkOverrideManager.ts
+++ b/src/NetworkOverrideManager.ts
@@ -25,6 +25,8 @@ import {logger, redactUrlForLogging} from './utils/logger.js';
interface BaseNetworkOverride {
urlPattern: string;
resourceType?: ResourceType;
+ abort?: boolean;
+ allowOrigin?: string;
}
export interface NetworkMockFilter {
@@ -32,6 +34,11 @@ export interface NetworkMockFilter {
resourceType?: ResourceType;
}
+interface NetworkMockActions {
+ abort?: boolean;
+ allowOrigin?: string;
+}
+
export interface UpstreamNetworkOverrideInput extends NetworkMockFilter {
kind: 'upstream';
upstreamUrl: string;
@@ -44,8 +51,12 @@ export interface FileNetworkOverrideInput extends NetworkMockFilter {
loadResponseFile: () => Promise<Uint8Array<ArrayBufferLike>>;
}
-export type NetworkMockInput =
- UpstreamNetworkOverrideInput | FileNetworkOverrideInput;
+export type NetworkMockInput = NetworkMockActions &
+ (
+ | UpstreamNetworkOverrideInput
+ | FileNetworkOverrideInput
+ | (NetworkMockFilter & {kind?: undefined})
+ );
interface NetworkOverrideBase extends BaseNetworkOverride {
id: number;
@@ -68,7 +79,12 @@ export interface FileNetworkOverride extends NetworkOverrideBase {
contentType: string;
}
-export type NetworkOverride = UpstreamNetworkOverride | FileNetworkOverride;
+export interface PassthroughNetworkOverride extends NetworkOverrideBase {
+ kind: 'passthrough';
+}
+
+export type NetworkOverride =
+ UpstreamNetworkOverride | FileNetworkOverride | PassthroughNetworkOverride;
interface StoredNetworkOverrideBase extends NetworkOverrideBase {
matcher: URLPattern;
@@ -87,7 +103,9 @@ interface StoredFileNetworkOverride extends StoredNetworkOverrideBase {
}
type StoredNetworkOverride =
- StoredUpstreamNetworkOverride | StoredFileNetworkOverride;
+ | StoredUpstreamNetworkOverride
+ | StoredFileNetworkOverride
+ | (StoredNetworkOverrideBase & {kind: 'passthrough'});
const DEFAULT_URL_PATTERN = '*://*:*/*';
@@ -122,6 +140,8 @@ function toNetworkOverride(override: StoredNetworkOverride): NetworkOverride {
id: override.id,
urlPattern: override.urlPattern,
resourceType: override.resourceType,
+ abort: override.abort,
+ allowOrigin: override.allowOrigin,
diagnostics: {...override.diagnostics},
};
if (override.kind === 'upstream') {
@@ -131,6 +151,9 @@ function toNetworkOverride(override: StoredNetworkOverride): NetworkOverride {
upstreamUrl: override.upstreamUrl,
};
}
+ if (override.kind === 'passthrough') {
+ return {...base, kind: override.kind};
+ }
return {
...base,
kind: override.kind,
@@ -212,6 +235,8 @@ export class NetworkOverrideManager {
id: existing?.id ?? this.#nextId,
urlPattern,
resourceType: input.resourceType,
+ abort: input.abort ?? existing?.abort ?? false,
+ allowOrigin: input.allowOrigin ?? existing?.allowOrigin,
matcher: new URLPattern(urlPattern),
diagnostics: {hits: 0, errors: 0, navigations: 0},
};
@@ -223,16 +248,26 @@ export class NetworkOverrideManager {
upstreamUrl: input.upstreamUrl,
};
}
-
- await input.loadResponseFile();
- return {
- ...base,
- kind: input.kind,
- responseFilePath: input.responseFilePath,
- contentType:
- input.contentType ?? inferContentType(input.responseFilePath),
- loadResponseFile: input.loadResponseFile,
- };
+ if (input.kind === 'file') {
+ await input.loadResponseFile();
+ return {
+ ...base,
+ kind: input.kind,
+ responseFilePath: input.responseFilePath,
+ contentType:
+ input.contentType ?? inferContentType(input.responseFilePath),
+ loadResponseFile: input.loadResponseFile,
+ };
+ }
+ if (
+ base.allowOrigin !== undefined &&
+ (!existing || existing.kind === 'passthrough')
+ ) {
+ throw new Error(
+ 'allowOrigin requires a body or upstream source on the mock.',
+ );
+ }
+ return existing ? {...existing, ...base} : {...base, kind: 'passthrough'};
}
list(filter: NetworkMockFilter = {}): NetworkOverride[] {
@@ -390,18 +425,32 @@ export class NetworkOverrideManager {
}
override.diagnostics.hits++;
+ if (override.abort) {
+ await this.#abortRequest(request);
+ return;
+ }
+ if (override.kind === 'passthrough') {
+ await this.#continueRequest(request);
+ return;
+ }
try {
if (override.kind === 'upstream') {
- await this.#fulfillUpstream(request, override.upstreamUrl);
+ await this.#fulfillUpstream(
+ request,
+ override.upstreamUrl,
+ override.allowOrigin,
+ );
return;
}
-
const body = await override.loadResponseFile();
await request.respond({
status: 200,
contentType: override.contentType,
headers: {
'Cache-Control': 'no-store',
+ ...(override.allowOrigin !== undefined
+ ? {'Access-Control-Allow-Origin': override.allowOrigin}
+ : {}),
},
body,
});
@@ -434,6 +483,7 @@ export class NetworkOverrideManager {
async #fulfillUpstream(
request: HTTPRequest,
upstreamUrl: string,
+ allowOrigin?: string,
): Promise<void> {
const method = request.method();
if (method !== 'GET' && method !== 'HEAD') {
@@ -463,6 +513,9 @@ export class NetworkOverrideManager {
if (cookies.length > 0) {
responseHeaders['set-cookie'] = cookies;
}
+ if (allowOrigin !== undefined) {
+ responseHeaders['access-control-allow-origin'] = allowOrigin;
+ }
await request.respond({
status: response.status,
headers: responseHeaders,
@@ -488,7 +541,7 @@ export class NetworkOverrideManager {
try {
await request.abort('failed');
} catch (error) {
- logger?.('Failed to abort a request after a network mock error', error);
+ logger?.('Failed to abort an intercepted network request', error);
}
}
}
diff --git a/src/config/cli-options.ts b/src/config/cli-options.ts
index 20f92265..ab95b7cd 100644
--- a/src/config/cli-options.ts
+++ b/src/config/cli-options.ts
@@ -1479,7 +1479,7 @@ export const commands: Commands = {
},
mock_network: {
description:
- 'Inspect or update network mocks for a page. With no actions, list mocks matching the supplied filters, or all mocks when no filters are given. Providing body or upstream updates the exact route/resourceType pair. An omitted route matches any URL. Other mocks are preserved. The most recently updated matching mock wins and persists across navigations. Configure before navigating or reloading; inspection shows hit counts and replacement errors. Upstream responses use server-side GET/HEAD fetches. Changes are rejected during a performance trace. Mocks disable the page HTTP cache and intercept every request, affecting measurements. Service workers can bypass mocks. Use remove_network_mock to remove mocks. (requires flag: --categoryNetworkMocks=true)',
+ 'Inspect or update network mocks for a page. With no actions, list mocks matching the supplied filters, or all mocks when no filters are given. Providing abort (including false), allowOrigin, body, or upstream updates the exact route/resourceType pair; omitted actions keep existing settings. Remove and recreate a mock to clear its source or allowOrigin. An omitted route matches any URL. Other mocks are preserved. abort=true suppresses its response and allowOrigin header. The most recently updated matching mock wins and persists across navigations. Configure before navigating or reloading; inspection shows hit counts and replacement errors. allowOrigin requires a body or upstream source. Upstream responses use server-side GET/HEAD fetches. Changes are rejected during a performance trace. Mocks disable the page HTTP cache and intercept every request, affecting measurements. Service workers can bypass mocks. Use remove_network_mock to remove mocks. (requires flag: --categoryNetworkMocks=true)',
category: 'Network mocks',
args: {
pageId: {
@@ -1525,6 +1525,22 @@ export const commands: Commands = {
'other',
],
},
+ abort: {
+ name: 'abort',
+ type: 'boolean',
+ description:
+ 'Abort matching requests when true. When false, use the stored body or upstream source, or send the request to the network if neither is set. A mock without a source still wins over older matching mocks. Abortion takes precedence over body, upstream, and allowOrigin.',
+ required: false,
+ positional: false,
+ },
+ allowOrigin: {
+ name: 'allowOrigin',
+ type: 'string',
+ description:
+ 'Set the Access-Control-Allow-Origin response header to `*`, `null`, or a serialized origin such as https://example.com. Requires body or upstream, either supplied now or already set on the mock. This does not configure preflight or credential headers.',
+ required: false,
+ positional: false,
+ },
body: {
name: 'body',
type: 'string',
diff --git a/src/formatters/NetworkOverridesFormatter.ts b/src/formatters/NetworkOverridesFormatter.ts
index ba4a7351..62ff2b94 100644
--- a/src/formatters/NetworkOverridesFormatter.ts
+++ b/src/formatters/NetworkOverridesFormatter.ts
@@ -32,11 +32,19 @@ export class NetworkOverridesFormatter {
const source =
override.kind === 'file'
? override.responseFilePath + ' (' + override.contentType + ')'
- : override.upstreamUrl;
+ : override.kind === 'upstream'
+ ? override.upstreamUrl
+ : 'original response';
const resourceType = override.resourceType
? ' [' + override.resourceType + ']'
: '';
lines.push(override.urlPattern + resourceType + ' -> ' + source);
+ if (override.abort) {
+ lines.push(' Requests are aborted; the response source is ignored.');
+ }
+ if (override.allowOrigin !== undefined) {
+ lines.push(' Access-Control-Allow-Origin: ' + override.allowOrigin);
+ }
const {hits, errors, navigations, lastError} = override.diagnostics;
lines.push(
' Since configured: ' + hits + ' hits, ' + errors + ' errors.',
diff --git a/src/telemetry/tool_call_metrics.json b/src/telemetry/tool_call_metrics.json
index 5863cf8e..56065f0c 100644
--- a/src/telemetry/tool_call_metrics.json
+++ b/src/telemetry/tool_call_metrics.json
@@ -1432,6 +1432,14 @@
{
"name": "upstream_length",
"argType": "number"
+ },
+ {
+ "name": "abort",
+ "argType": "boolean"
+ },
+ {
+ "name": "allow_origin_length",
+ "argType": "number"
}
]
},
diff --git a/src/tools/network.ts b/src/tools/network.ts
index e1b60e5d..eb458b2c 100644
--- a/src/tools/network.ts
+++ b/src/tools/network.ts
@@ -198,6 +198,32 @@ const mockNetworkSchema = zod
// eslint-disable-next-line @local/enforce-zod-schema -- Flat parameters.
.object({
...mockFilterSchema,
+ abort: zod
+ .boolean()
+ .optional()
+ .describe(
+ 'Abort matching requests when true. When false, use the stored ' +
+ 'body or upstream source, or send the request to the network if ' +
+ 'neither is set. A mock without a source still wins over older ' +
+ 'matching mocks. Abortion takes precedence over body, upstream, ' +
+ 'and allowOrigin.',
+ ),
+ allowOrigin: zod
+ .string()
+ .refine(value => {
+ if (value === '*' || value === 'null') {
+ return true;
+ }
+ try {
+ return new URL(value).origin === value;
+ } catch {
+ return false;
+ }
+ }, 'allowOrigin must be *, null, or a serialized origin such as https://example.com.')
+ .optional()
+ .describe(
+ 'Set the Access-Control-Allow-Origin response header to `*`, `null`, or a serialized origin such as https://example.com. Requires body or upstream, either supplied now or already set on the mock. This does not configure preflight or credential headers.',
+ ),
body: zod
.string()
.trim()
@@ -226,13 +252,17 @@ export const mockNetwork: PageToolFactory = definePageTool(() => ({
description:
'Inspect or update network mocks for a page. With no actions, list mocks ' +
'matching the supplied filters, or all mocks when no filters are given. ' +
- 'Providing body or upstream updates the exact route/resourceType pair. ' +
+ 'Providing abort (including false), allowOrigin, body, or upstream updates ' +
+ 'the exact route/resourceType pair; omitted actions keep existing settings. ' +
+ 'Remove and recreate a mock to clear its source or allowOrigin. ' +
'An omitted route matches any URL. Other mocks are preserved. ' +
+ 'abort=true suppresses its response and allowOrigin header. ' +
'The most recently updated matching mock wins and persists across ' +
'navigations. Configure before navigating or reloading; inspection shows ' +
- 'hit counts and replacement errors. Upstream responses use server-side ' +
- 'GET/HEAD fetches. Changes are rejected during ' +
- 'a performance trace. Mocks disable the page HTTP cache and intercept ' +
+ 'hit counts and replacement errors. allowOrigin requires a body or ' +
+ 'upstream source. Upstream responses use server-side GET/HEAD fetches. ' +
+ 'Changes are rejected during a performance trace. ' +
+ 'Mocks disable the page HTTP cache and intercept ' +
'every request, affecting measurements. Service workers can bypass mocks. ' +
'Use remove_network_mock to remove mocks.',
annotations: {
@@ -249,29 +279,38 @@ export const mockNetwork: PageToolFactory = definePageTool(() => ({
urlPattern: params.route,
resourceType: params.resourceType,
};
- let input: NetworkMockInput | undefined;
- if (params.upstream !== undefined) {
- input = {...filter, kind: 'upstream', upstreamUrl: params.upstream};
- } else if (params.body !== undefined) {
- const responseFilePath = params.body;
- input = {
+ let overrides;
+ if (
+ params.abort === undefined &&
+ params.allowOrigin === undefined &&
+ params.body === undefined &&
+ params.upstream === undefined
+ ) {
+ overrides = request.page.listNetworkMocks(filter);
+ } else {
+ let input: NetworkMockInput = {
...filter,
- kind: 'file',
- responseFilePath,
- loadResponseFile: async () => {
- const validatedPath = await context.validatePath(responseFilePath);
- return await fs.readFile(validatedPath);
- },
+ abort: params.abort,
+ allowOrigin: params.allowOrigin,
};
- }
- let overrides;
- if (input) {
+ if (params.upstream !== undefined) {
+ input = {...input, kind: 'upstream', upstreamUrl: params.upstream};
+ } else if (params.body !== undefined) {
+ const responseFilePath = params.body;
+ input = {
+ ...input,
+ kind: 'file',
+ responseFilePath,
+ loadResponseFile: async () => {
+ const validatedPath = await context.validatePath(responseFilePath);
+ return await fs.readFile(validatedPath);
+ },
+ };
+ }
overrides = [await request.page.mockNetwork(input)];
response.appendResponseLine(
'Network mock configured. Reload or navigate the page to apply it.',
);
- } else {
- overrides = request.page.listNetworkMocks(filter);
}
if (overrides.length === 0) {
diff --git a/tests/NetworkOverrideManager.test.ts b/tests/NetworkOverrideManager.test.ts
index 666d1127..82c500aa 100644
--- a/tests/NetworkOverrideManager.test.ts
+++ b/tests/NetworkOverrideManager.test.ts
@@ -368,6 +368,28 @@ describe('NetworkOverrideManager', () => {
await manager.dispose();
});
+ it('updates abort while preserving the rule id and response source', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ const previous = await manager.mock({
+ kind: 'file',
+ urlPattern: '*://*:*/*app.js',
+ responseFilePath: '/tmp/app.js',
+ loadResponseFile: async () => new Uint8Array(),
+ });
+ const updated = await manager.mock({
+ urlPattern: '*://*:*/*app.js',
+ abort: true,
+ });
+ assert.deepEqual(updated, {...previous, abort: true});
+ assert.deepEqual(manager.list(), [updated]);
+ sinon.assert.calledOnceWithExactly(pptrPage.setRequestInterception, true);
+ await manager.dispose();
+ });
+
it('validates a local file before updating an existing rule', async () => {
const pptrPage = createMockPuppeteerPage();
const manager = new NetworkOverrideManager(
@@ -416,6 +438,8 @@ describe('NetworkOverrideManager', () => {
kind: 'file',
urlPattern: '*://*:*/*app.js',
resourceType: undefined,
+ abort: false,
+ allowOrigin: undefined,
responseFilePath: '/tmp/app.js',
contentType: 'application/javascript; charset=utf-8',
},
@@ -532,9 +556,7 @@ describe('NetworkOverrideManager', () => {
);
const previous = await manager.mock({
urlPattern: '*://*:*/*app.js',
- kind: 'file',
- responseFilePath: '/tmp/app.js',
- loadResponseFile: async () => new Uint8Array(),
+ abort: true,
});
pptrPage.setCacheEnabled
.withArgs(true)
@@ -554,12 +576,7 @@ describe('NetworkOverrideManager', () => {
const request = createMockHTTPRequest();
pptrPage.emit('request', request);
await settle();
- sinon.assert.calledOnceWithExactly(request.respond, {
- status: 200,
- contentType: 'application/javascript; charset=utf-8',
- headers: {'Cache-Control': 'no-store'},
- body: new Uint8Array(),
- });
+ sinon.assert.calledOnceWithExactly(request.abort, 'failed');
sinon.assert.notCalled(request.continue);
await manager.dispose();
});
@@ -570,43 +587,164 @@ describe('NetworkOverrideManager', () => {
pptrPage,
createMockServerConfig(),
);
- const scripts = await manager.mock({
- resourceType: 'script',
+ const scripts = await manager.mock({resourceType: 'script', abort: true});
+ const all = await manager.mock({abort: true});
+ const updated = await manager.mock({resourceType: 'script', abort: false});
+ assert.equal(scripts.urlPattern, '*://*:*/*');
+ assert.equal(updated.id, scripts.id);
+ assert.deepEqual(manager.list(), [all, updated]);
+ const request = createMockHTTPRequest({
+ url: 'http://localhost:8080/app.js?v=1',
+ });
+ pptrPage.emit('request', request);
+ await settle();
+ sinon.assert.calledOnceWithExactly(request.continue);
+ sinon.assert.notCalled(request.abort);
+ assert.equal(
+ manager.list({resourceType: 'script'})[0]?.diagnostics.hits,
+ 1,
+ );
+ assert.equal(manager.list()[0]?.diagnostics.hits, 0);
+ await manager.dispose();
+ });
+
+ it('aborts matching requests without recording a replacement error and restores the source with abort false', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ const loadResponseFile = sinon
+ .stub()
+ .resolves(new TextEncoder().encode('replacement'));
+ await manager.mock({
kind: 'file',
+ urlPattern: '*://*:*/*app.js',
responseFilePath: '/tmp/app.js',
- loadResponseFile: async () => new Uint8Array(),
+ loadResponseFile,
});
- const all = await manager.mock({
+ await manager.mock({urlPattern: '*://*:*/*app.js', abort: true});
+ const blocked = createMockHTTPRequest();
+ pptrPage.emit('request', blocked);
+ await settle();
+ sinon.assert.calledOnceWithExactly(blocked.abort, 'failed');
+ sinon.assert.notCalled(blocked.respond);
+ sinon.assert.calledOnceWithExactly(loadResponseFile);
+ assert.deepEqual(manager.list()[0]?.diagnostics, {
+ hits: 1,
+ errors: 0,
+ navigations: 0,
+ });
+ assert.match(
+ new NetworkOverridesFormatter(manager.list()).toString(),
+ /Requests are aborted/,
+ );
+ await manager.mock({urlPattern: '*://*:*/*app.js', abort: false});
+ const restored = createMockHTTPRequest();
+ pptrPage.emit('request', restored);
+ await settle();
+ sinon.assert.calledOnceWithExactly(restored.respond, {
+ status: 200,
+ contentType: 'application/javascript; charset=utf-8',
+ headers: {'Cache-Control': 'no-store'},
+ body: new TextEncoder().encode('replacement'),
+ });
+ sinon.assert.notCalled(restored.abort);
+ await manager.dispose();
+ });
+
+ it('sets allow-origin for a local body and retains it when the body is updated', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ const loadResponseFile = sinon
+ .stub()
+ .resolves(new TextEncoder().encode('replacement'));
+ await manager.mock({
kind: 'file',
+ urlPattern: '*://*:*/*app.js',
responseFilePath: '/tmp/app.js',
- loadResponseFile: async () => new Uint8Array(),
+ loadResponseFile,
+ allowOrigin: 'https://consumer.example',
});
- const updated = await manager.mock({
- resourceType: 'script',
+ await manager.mock({
kind: 'file',
- responseFilePath: '/tmp/updated.js',
- loadResponseFile: async () => new Uint8Array(),
- });
- assert.equal(scripts.urlPattern, '*://*:*/*');
- assert.equal(updated.id, scripts.id);
- assert.deepEqual(manager.list(), [all, updated]);
- const request = createMockHTTPRequest({
- url: 'http://localhost:8080/app.js?v=1',
+ urlPattern: '*://*:*/*app.js',
+ responseFilePath: '/tmp/app.js',
+ loadResponseFile,
});
+ const request = createMockHTTPRequest();
pptrPage.emit('request', request);
await settle();
sinon.assert.calledOnceWithExactly(request.respond, {
status: 200,
contentType: 'application/javascript; charset=utf-8',
- headers: {'Cache-Control': 'no-store'},
- body: new Uint8Array(),
+ headers: {
+ 'Cache-Control': 'no-store',
+ 'Access-Control-Allow-Origin': 'https://consumer.example',
+ },
+ body: new TextEncoder().encode('replacement'),
});
- sinon.assert.notCalled(request.abort);
- assert.equal(
- manager.list({resourceType: 'script'})[0]?.diagnostics.hits,
- 1,
+ assert.match(
+ new NetworkOverridesFormatter(manager.list()).toString(),
+ /Access-Control-Allow-Origin: https:\/\/consumer.example/,
);
- assert.equal(manager.list()[0]?.diagnostics.hits, 0);
+ await manager.dispose();
+ });
+
+ it('rejects allowOrigin without a body or upstream before activating interception', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ for (const abort of [undefined, true, false]) {
+ await assert.rejects(
+ manager.mock({allowOrigin: '*', abort}),
+ /allowOrigin requires a body or upstream/,
+ );
+ }
+ assert.deepEqual(manager.list(), []);
+ sinon.assert.notCalled(pptrPage.setCacheEnabled);
+ await manager.dispose();
+ });
+
+ it('rejects allowOrigin updates to a rule without a source and preserves its state', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ const previous = await manager.mock({abort: true});
+ await assert.rejects(
+ manager.mock({allowOrigin: '*', abort: false}),
+ /allowOrigin requires a body or upstream/,
+ );
+ assert.deepEqual(manager.list(), [previous]);
+ await manager.dispose();
+ });
+
+ it('does not retry a rejected abort or record a replacement error', async () => {
+ const pptrPage = createMockPuppeteerPage();
+ const manager = new NetworkOverrideManager(
+ pptrPage,
+ createMockServerConfig(),
+ );
+ await manager.mock({abort: true});
+ const request = createMockHTTPRequest();
+ request.abort.rejects(new Error('Request is already handled'));
+ pptrPage.emit('request', request);
+ await settle();
+ sinon.assert.calledOnceWithExactly(request.abort, 'failed');
+ sinon.assert.notCalled(request.respond);
+ sinon.assert.notCalled(request.continue);
+ assert.deepEqual(manager.list()[0]?.diagnostics, {
+ hits: 1,
+ errors: 0,
+ navigations: 0,
+ });
await manager.dispose();
});
@@ -722,7 +860,7 @@ describe('NetworkOverrideManager', () => {
await manager.dispose();
});
- it('fulfills decoded upstream bodies without stale compression headers', async () => {
+ it('updates allow-origin on an existing upstream source and fulfills decoded bodies without stale compression headers', async () => {
const pptrPage = createMockPuppeteerPage();
const manager = new NetworkOverrideManager(
pptrPage,
@@ -733,6 +871,7 @@ describe('NetworkOverrideManager', () => {
urlPattern: '*://*:*/*app.js',
upstreamUrl: 'https://example.com/replacement.js',
});
+ await manager.mock({urlPattern: '*://*:*/*app.js', allowOrigin: '*'});
sinon.stub(globalThis, 'fetch').resolves(
new Response('decoded', {
headers: {
@@ -749,6 +888,7 @@ describe('NetworkOverrideManager', () => {
status: 200,
headers: {
'content-type': 'text/javascript',
+ 'access-control-allow-origin': '*',
},
body: new TextEncoder().encode('decoded'),
});
diff --git a/tests/network_overrides.test.ts b/tests/network_overrides.test.ts
index acd498ae..6ca382e2 100644
--- a/tests/network_overrides.test.ts
+++ b/tests/network_overrides.test.ts
@@ -245,6 +245,53 @@ describe('network overrides integration', () => {
});
});
+ it('enforces CORS for cross-origin fetches with allowOrigin and fails requests with abort: true', async () => {
+ using directory = createTempDir('network-mock-cors-');
+ const body = join(directory.path, 'response.txt');
+ await writeFile(body, 'mock response');
+ server.addHtmlRoute('/cors-page', html`<main>CORS test</main>`);
+ server.addRoute('/cors-response', (_req, res) => {
+ res.end('original response');
+ });
+ const route = server
+ .getRoute('/cors-response')
+ .replace('127.0.0.1', 'localhost');
+
+ await withMcpContext(async (response, context, args) => {
+ const mcpPage = context.getSelectedMcpPage();
+ const page = mcpPage.pptrPage;
+ await page.goto(server.getRoute('/cors-page'));
+ const fetchBody = () =>
+ page.evaluate(async url => {
+ const response = await fetch(url, {
+ signal: AbortSignal.timeout(5_000),
+ });
+ return await response.text();
+ }, route);
+
+ await mockNetwork(args).handler(
+ {params: {route, body}, page: mcpPage},
+ response,
+ context,
+ );
+ await assert.rejects(fetchBody, /Failed to fetch/);
+
+ await mockNetwork(args).handler(
+ {params: {route, allowOrigin: server.baseUrl}, page: mcpPage},
+ response,
+ context,
+ );
+ assert.strictEqual(await fetchBody(), 'mock response');
+
+ await mockNetwork(args).handler(
+ {params: {route, abort: true}, page: mcpPage},
+ response,
+ context,
+ );
+ await assert.rejects(fetchBody, /Failed to fetch/);
+ });
+ });
+
it('aborts the request when a local file disappears', async () => {
using directory = createTempDir('network-override-');
const filePath = join(directory.path, 'removed-override.js');
diff --git a/tests/tools/network.test.ts b/tests/tools/network.test.ts
index 4e9e1f95..244279c8 100644
--- a/tests/tools/network.test.ts
+++ b/tests/tools/network.test.ts
@@ -49,11 +49,23 @@ describe('network', () => {
{body: './script.js', upstream: 'https://example.com/script.js'},
{body: ' '},
{upstream: 'file:///tmp/script.js'},
- {route: '/app.js*', body: './app.js'},
+ {allowOrigin: 'https://example.com\r\nX-Header: value'},
+ {allowOrigin: '\n*\n'},
+ {allowOrigin: ' '},
+ {allowOrigin: 'https://example.com/path'},
+ {allowOrigin: 'https://example.com/'},
+ {allowOrigin: 'https://example.com?query=1'},
+ {allowOrigin: 'https://example.com#fragment'},
+ {allowOrigin: 'https://user:[email protected]'},
+ {allowOrigin: 'https://example.com:443'},
+ {allowOrigin: 'https://example.com https://other.example'},
+ {allowOrigin: 'example.com'},
+ {allowOrigin: 'file:///tmp/script.js'},
+ {route: '/app.js*', abort: true},
+ {resourceType: 'websocket', abort: true},
{route: '*app.js*', body: './app.js'},
{route: 'https://example.com/:file', body: './app.js'},
{route: 'https://example.com/(app|other).js', body: './app.js'},
- {resourceType: 'websocket', body: './app.js'},
]) {
it(
'rejects invalid mock parameters before any state change: ' +
@@ -71,6 +83,20 @@ describe('network', () => {
);
}
+ it('accepts wildcard, null, and serialized origins for allowOrigin', () => {
+ const schema = mockNetwork(createMockParsedArguments()).schema
+ .allowOrigin;
+ for (const origin of [
+ '*',
+ 'null',
+ 'https://example.com',
+ 'http://localhost:8080',
+ 'https://[::1]:8443',
+ ]) {
+ assert.strictEqual(schema.parse(origin), origin);
+ }
+ });
+
it('updates an upstream mock with the exact supplied actions', async () => {
const {page, context, response, args} = createHandlerMocks();
const override = {
@@ -79,6 +105,7 @@ describe('network', () => {
urlPattern: 'https://example.com/script.js*',
resourceType: 'script',
upstreamUrl: 'https://example.com/replacement.js',
+ allowOrigin: '*',
diagnostics: {hits: 0, errors: 0, navigations: 0},
} satisfies NetworkOverride;
page.mockNetwork.resolves(override);
@@ -88,6 +115,7 @@ describe('network', () => {
route: override.urlPattern,
resourceType: 'script',
upstream: override.upstreamUrl,
+ allowOrigin: '*',
},
page,
},
@@ -99,6 +127,8 @@ describe('network', () => {
urlPattern: override.urlPattern,
resourceType: 'script',
upstreamUrl: override.upstreamUrl,
+ abort: undefined,
+ allowOrigin: '*',
});
sinon.assert.notCalled(page.listNetworkMocks);
sinon.assert.notCalled(context.validatePath);
@@ -112,6 +142,85 @@ describe('network', () => {
);
});
+ for (const abort of [true, false]) {
+ it(
+ 'treats abort=' + abort + ' as an update without inventing a source',
+ async () => {
+ const {page, context, response, args} = createHandlerMocks();
+ page.mockNetwork.resolves({
+ id: 1,
+ kind: 'passthrough',
+ urlPattern: '*://*:*/*',
+ resourceType: 'script',
+ abort,
+ diagnostics: {hits: 0, errors: 0, navigations: 0},
+ });
+ await mockNetwork(args).handler(
+ {params: {resourceType: 'script', abort}, page},
+ response,
+ context,
+ );
+ sinon.assert.calledOnceWithExactly(page.mockNetwork, {
+ urlPattern: undefined,
+ resourceType: 'script',
+ abort,
+ allowOrigin: undefined,
+ });
+ sinon.assert.notCalled(page.listNetworkMocks);
+ },
+ );
+ }
+
+ it('updates only allowOrigin without replacing an existing source', async () => {
+ const {page, context, response, args} = createHandlerMocks();
+ page.mockNetwork.resolves({
+ id: 1,
+ kind: 'upstream',
+ urlPattern: '*://*:*/*',
+ upstreamUrl: 'https://example.com/app.js',
+ allowOrigin: '*',
+ diagnostics: {hits: 0, errors: 0, navigations: 0},
+ });
+ await mockNetwork(args).handler(
+ {params: {allowOrigin: '*'}, page},
+ response,
+ context,
+ );
+ sinon.assert.calledOnceWithExactly(page.mockNetwork, {
+ urlPattern: undefined,
+ resourceType: undefined,
+ abort: undefined,
+ allowOrigin: '*',
+ });
+ sinon.assert.notCalled(page.listNetworkMocks);
+ });
+
+ it('configures an upstream source while aborting matching requests', async () => {
+ const {page, context, response, args} = createHandlerMocks();
+ page.mockNetwork.resolves({
+ id: 1,
+ kind: 'upstream',
+ urlPattern: '*://*:*/*',
+ upstreamUrl: 'https://example.com/app.js',
+ abort: true,
+ diagnostics: {hits: 0, errors: 0, navigations: 0},
+ });
+ await mockNetwork(args).handler(
+ {params: {upstream: 'https://example.com/app.js', abort: true}, page},
+ response,
+ context,
+ );
+ sinon.assert.calledOnceWithExactly(page.mockNetwork, {
+ kind: 'upstream',
+ urlPattern: undefined,
+ resourceType: undefined,
+ abort: true,
+ allowOrigin: undefined,
+ upstreamUrl: 'https://example.com/app.js',
+ });
+ sinon.assert.notCalled(page.listNetworkMocks);
+ });
+
it('propagates upstream policy failures without reporting success', async () => {
const {page, context, response, args} = createHandlerMocks();
page.mockNetwork.rejects(new Error('Blocked by blocklist'));
@@ -127,6 +236,8 @@ describe('network', () => {
kind: 'upstream',
urlPattern: undefined,
resourceType: undefined,
+ abort: undefined,
+ allowOrigin: undefined,
upstreamUrl: 'https://blocked.example/script.js',
});
sinon.assert.notCalled(response.appendResponseLine);
@@ -157,6 +268,8 @@ describe('network', () => {
kind: 'file',
urlPattern: undefined,
resourceType: undefined,
+ abort: undefined,
+ allowOrigin: undefined,
responseFilePath: '/tmp/script.js',
loadResponseFile: input.loadResponseFile,
});