Commit193a9b5

committed

fix: disallow duplicate WebSocket connections with same sid

This was caught thanks to the test suite there: [1]Rule: ignores WebSocket connection with same sid after upgrade[1]:https://github.com/socketio/engine.io-protocol/blob/main/test-suite/test-suite.js

1 parent6b2cc16 commit193a9b5Copy full SHA for 193a9b5

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ export class Server extends EventEmitter<never, never, ServerReservedEvents> {`
`211`	`211`	`// the client must exist since we have checked it in the verify method`
`212`	`212`	`constsocket=this.clients.get(sid)!;`
`213`	`213`
`214`		`-if(url.searchParams.get("transport")==="websocket"){`
	`214`	`+if(req.headers.has("upgrade")){`
`215`	`215`	`consttransport=newWS(this.opts);`
`216`	`216`
`217`	`217`	`constpromise=transport.onRequest(req,responseHeaders);`
`@@ -263,7 +263,7 @@ export class Server extends EventEmitter<never, never, ServerReservedEvents> {`
`263`	`263`	`});`
`264`	`264`	`}`
`265`	`265`	`constpreviousTransport=client.transport.name;`
`266`		`-if(!req.headers.has("upgrade")&&previousTransport!==transport){`
	`266`	`+if(previousTransport==="websocket"){`
`267`	`267`	`getLogger("engine.io").debug(`
`268`	`268`	`"[server] unexpected transport without upgrade",`
`269`	`269`	`);`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,4 +278,24 @@ describe("verification", () => {`
`278`	`278`	`};`
`279`	`279`	`});`
`280`	`280`	`});`
	`281`	`+`
	`282`	`+it("should disallow duplicate WebSocket connections",()=>{`
	`283`	`+constengine=newServer();`
	`284`	`+`
	`285`	`+returntestServeWithAsyncResults(engine,1,(port,done)=>{`
	`286`	`+constsocket=newWebSocket(`
	`287`	+`ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`,
	`288`	`+);`
	`289`	`+`
	`290`	`+socket.onmessage=({ data})=>{`
	`291`	`+consthandshake=JSON.parse(data.substring(1));`
	`292`	`+`
	`293`	`+constsocket=newWebSocket(`
	`294`	+`ws://localhost:${port}/engine.io/?EIO=4&transport=websocket&sid=${handshake.sid}`,
	`295`	`+);`
	`296`	`+`
	`297`	`+socket.onclose=done;`
	`298`	`+};`
	`299`	`+});`
	`300`	`+});`
`281`	`301`	`});`

Comments

(0)