Skip to content

Commit 5481776

Browse files
fix(mcp): preserve origin filters when modifying request headers (#43637)
Co-authored-by: microsoft-playwright-automation[bot] <203992400+microsoft-playwright-automation[bot]@users.noreply.github.com> Co-authored-by: Dmitry Gozman <dgozman@gmail.com>
1 parent 7199ba4 commit 5481776

2 files changed

Lines changed: 23 additions & 4 deletions

File tree

‎packages/playwright-core/src/tools/backend/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const route = defineTool({
6666
return;
6767
}
6868

69-
// Otherwise, modify headers and continue
69+
// Otherwise, modify headers and fall back to the remaining routes
7070
const headers = { ...route.request().headers() };
7171
if (addHeaders) {
7272
// Header names are case-insensitive, and request headers use lowercase names.
@@ -77,7 +77,7 @@ const route = defineTool({
7777
for (const header of removeHeaders)
7878
delete headers[header.toLowerCase()];
7979
}
80-
await route.continue({ headers });
80+
await route.fallback({ headers });
8181
};
8282

8383
const entry: RouteEntry = {

‎tests/mcp/route.spec.ts‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,16 @@ test('browser_route mocks response with custom headers', async ({ client, server
143143
});
144144
});
145145

146-
test('browser_route modifies request headers', async ({ client, server }) => {
146+
test('browser_route modifies request headers', {
147+
annotation: { type: 'issue', description: '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/microsoft/playwright/issues/43630' },
148+
}, async ({ startClient, server, httpsServer }) => {
149+
const { client } = await startClient({
150+
args: [
151+
'--ignore-https-errors',
152+
'--allowed-origins', `${server.PREFIX};${httpsServer.PREFIX}`,
153+
'--blocked-origins', httpsServer.PREFIX,
154+
],
155+
});
147156
let receivedHeaders: Record<string, string> = {};
148157
server.setRoute('/api/check', (req, res) => {
149158
receivedHeaders = req.headers as Record<string, string>;
@@ -164,7 +173,7 @@ test('browser_route modifies request headers', async ({ client, server }) => {
164173
await client.callTool({
165174
name: 'browser_route',
166175
arguments: {
167-
pattern: '**/api/check',
176+
pattern: '**',
168177
headers: ['X-Custom-Header: test-value'],
169178
},
170179
});
@@ -177,6 +186,16 @@ test('browser_route modifies request headers', async ({ client, server }) => {
177186

178187
await requestPromise;
179188
expect(receivedHeaders['x-custom-header']).toBe('test-value');
189+
190+
for (const url of [httpsServer.EMPTY_PAGE, server.CROSS_PROCESS_PREFIX + '/empty.html']) {
191+
expect.soft(await client.callTool({
192+
name: 'browser_navigate',
193+
arguments: { url },
194+
})).toHaveResponse({
195+
isError: true,
196+
error: expect.stringMatching(/Blocked by Web Inspector|NS_ERROR_FAILURE|net::ERR_BLOCKED_BY_CLIENT/),
197+
});
198+
}
180199
});
181200

182201
for (const { title, headers, removeHeaders, expected } of [

0 commit comments

Comments
 (0)