From a1ff1a453c309c2f14c64ec31a3c43ef784781e2 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Tue, 25 Jun 2024 06:39:02 -0700 Subject: fix(ext/websocket): drop connection when close frame not ack (#24301) Fixes #24292 --- tests/unit/websocket_test.ts | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'tests/unit') diff --git a/tests/unit/websocket_test.ts b/tests/unit/websocket_test.ts index 74e85052e..362957b2d 100644 --- a/tests/unit/websocket_test.ts +++ b/tests/unit/websocket_test.ts @@ -761,3 +761,47 @@ Deno.test("Close without frame", async () => { }; await promise; }); + +Deno.test("Close connection", async () => { + const ac = new AbortController(); + const listeningDeferred = Promise.withResolvers(); + + const server = Deno.serve({ + handler: (req) => { + const { socket, response } = Deno.upgradeWebSocket(req); + socket.onmessage = function (e) { + socket.close(1008); + assertEquals(e.data, "Hello"); + }; + socket.onclose = () => { + ac.abort(); + }; + socket.onerror = () => fail(); + return response; + }, + signal: ac.signal, + onListen: () => listeningDeferred.resolve(), + hostname: "localhost", + port: servePort, + }); + + await listeningDeferred.promise; + + const conn = await Deno.connect({ port: servePort, hostname: "localhost" }); + await conn.write( + new TextEncoder().encode( + "GET / HTTP/1.1\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nSec-WebSocket-Version: 13\r\n\r\n", + ), + ); + + // Write a 2 text frame saying "Hello" + await conn.write(new Uint8Array([0x81, 0x05])); + await conn.write(new TextEncoder().encode("Hello")); + + // We are a bad client so we won't acknowledge the close frame + await conn.write(new Uint8Array([0x81, 0x05])); + await conn.write(new TextEncoder().encode("Hello")); + + await server.finished; + conn.close(); +}); -- cgit v1.2.3