Skip to content

Fix sockets can stay open when upgrade failed #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2015
Merged

Fix sockets can stay open when upgrade failed #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,14 @@ Server.prototype.onWebSocket = function(req, socket){
req.websocket = socket;

if (id) {
if (!this.clients[id]) {
var client = this.clients[id];
if (!client) {
debug('upgrade attempt for closed client');
socket.close();
} else if (this.clients[id].upgraded) {
} else if (client.upgrading) {
debug('transport has already been trying to upgrade');
socket.close();
} else if (client.upgraded) {
debug('transport had already been upgraded');
socket.close();
} else {
Expand All @@ -348,7 +352,7 @@ Server.prototype.onWebSocket = function(req, socket){
} else {
transport.supportsBinary = true;
}
this.clients[id].maybeUpgrade(transport);
client.maybeUpgrade(transport);
}
} else {
this.handshake(req._query.transport, req);
Expand Down
46 changes: 40 additions & 6 deletions lib/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = Socket;
function Socket (id, server, transport, req) {
this.id = id;
this.server = server;
this.upgrading = false;
this.upgraded = false;
this.readyState = 'opening';
this.writeBuffer = [];
Expand Down Expand Up @@ -161,13 +162,14 @@ Socket.prototype.maybeUpgrade = function (transport) {
debug('might upgrade socket transport from "%s" to "%s"'
, this.transport.name, transport.name);

this.upgrading = true;

var self = this;

// set transport upgrade timer
self.upgradeTimeoutTimer = setTimeout(function () {
debug('client did not complete upgrade - closing transport');
clearInterval(self.checkIntervalTimer);
self.checkIntervalTimer = null;
cleanup();
if ('open' == transport.readyState) {
transport.close();
}
Expand All @@ -180,22 +182,20 @@ Socket.prototype.maybeUpgrade = function (transport) {
self.checkIntervalTimer = setInterval(check, 100);
} else if ('upgrade' == packet.type && self.readyState != 'closed') {
debug('got upgrade packet - upgrading');
cleanup();
self.upgraded = true;
self.clearTransport();
self.setTransport(transport);
self.emit('upgrade', transport);
self.setPingTimeout();
self.flush();
clearInterval(self.checkIntervalTimer);
self.checkIntervalTimer = null;
clearTimeout(self.upgradeTimeoutTimer);
transport.removeListener('packet', onPacket);
if (self.readyState == 'closing') {
transport.close(function () {
self.onClose('forced close');
});
}
} else {
cleanup();
transport.close();
}
}
Expand All @@ -208,7 +208,41 @@ Socket.prototype.maybeUpgrade = function (transport) {
}
}

function cleanup() {
self.upgrading = false;

clearInterval(self.checkIntervalTimer);
self.checkIntervalTimer = null;

clearTimeout(self.upgradeTimeoutTimer);
self.upgradeTimeoutTimer = null;

transport.removeListener('packet', onPacket);
transport.removeListener('close', onTransportClose);
transport.removeListener('error', onError);
self.removeListener('close', onClose);
}

function onError(err) {
debug('client did not complete upgrade - %s', err);
cleanup();
transport.close();
transport = null;
}

function onTransportClose(){
onError("transport closed");
}

function onClose() {
onError("socket closed");
}

transport.on('packet', onPacket);
transport.once('close', onTransportClose);
transport.once('error', onError);

self.once('close', onClose);
};

/**
Expand Down