Skip to content
Merged
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
18 changes: 14 additions & 4 deletions lib/websocket-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,11 @@ class WebSocketServer extends EventEmitter {
return;
}

if (version !== 8 && version !== 13) {
if (version !== 13 && version !== 8) {
const message = 'Missing or invalid Sec-WebSocket-Version header';
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
'Sec-WebSocket-Version': '13, 8'
});
return;
}

Expand Down Expand Up @@ -526,15 +528,23 @@ function abortHandshake(socket, code, message, headers) {
* @param {Duplex} socket The socket of the upgrade request
* @param {Number} code The HTTP response status code
* @param {String} message The HTTP response body
* @param {Object} [headers] The HTTP response headers
* @private
*/
function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
function abortHandshakeOrEmitwsClientError(
server,
req,
socket,
code,
message,
headers
) {
if (server.listenerCount('wsClientError')) {
const err = new Error(message);
Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);

server.emit('wsClientError', err, socket, req);
} else {
abortHandshake(socket, code, message);
abortHandshake(socket, code, message, headers);
}
}
2 changes: 2 additions & 0 deletions test/websocket-server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@ describe('WebSocketServer', () => {

req.on('response', (res) => {
assert.strictEqual(res.statusCode, 400);
assert.strictEqual(res.headers['sec-websocket-version'], '13, 8');

const chunks = [];

Expand Down Expand Up @@ -849,6 +850,7 @@ describe('WebSocketServer', () => {

req.on('response', (res) => {
assert.strictEqual(res.statusCode, 400);
assert.strictEqual(res.headers['sec-websocket-version'], '13, 8');

const chunks = [];

Expand Down