Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/playwright-core/src/remote/playwrightConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ export class PlaywrightConnection {
transport.on('message', async (message: string) => {
await lock;
const messageString = Buffer.from(message).toString();
const jsonMessage = JSON.parse(messageString);
let jsonMessage: any;
try {
jsonMessage = JSON.parse(messageString);
} catch (e) {
debugLogger.log('server', `[${this._id}] failed to parse message: ${e}`);
this.close({ code: 1007, reason: 'Malformed message' });
return;
}
if (debugLogger.isEnabled('server:channel'))
debugLogger.log('server:channel', `[${this._id}] ${monotonicTime() * 1000} ◀ RECV ${messageString}`);
if (debugLogger.isEnabled('server:metadata'))
Expand Down
16 changes: 16 additions & 0 deletions tests/library/browsertype-connect.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,22 @@ for (const kind of ['launchServer', 'run-server'] as const) {
}
});

test('should not crash on malformed json frame', async ({ connect, startRemoteServer }) => {
const remoteServer = await startRemoteServer(kind);
const ws = new WebSocket(remoteServer.wsEndpoint());
await new Promise<void>((resolve, reject) => {
ws.once('open', resolve);
ws.once('error', reject);
});
ws.send(']');
await new Promise<void>(resolve => ws.once('close', () => resolve()));
// Server should still be alive and accept new connections.
const browser = await connect(remoteServer.wsEndpoint());
const page = await browser.newPage();
expect(await page.evaluate('1 + 2')).toBe(3);
await browser.close();
});

test('should be able to visit ipv6', async ({ connect, startRemoteServer, ipV6ServerPort, channel }) => {
test.fail(!!process.env.INSIDE_DOCKER, 'docker does not support IPv6 by default');
test.fail(channel === 'webkit-wsl', 'WebKit on WSL does not support IPv6: https://github.com/microsoft/WSL/issues/10803');
Expand Down
Loading