Skip to content
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.

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

Jump to bottom

server: send validation failure reason to clients #109

Merged
merged 1 commit into from Nov 5, 2012
Merged

server: send validation failure reason to clients #109

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 29 additions & 7 deletions lib/server.js
View file
Open in desktop
Expand Up @@ -45,6 +45,22 @@ function Server(opts){
}
};

/**
* Protocol errors mappings.
*/

Server.errors = {
UNKNOWN_TRANSPORT: 0,
UNKNOWN_SID: 1,
BAD_HANDSHAKE_METHOD: 2
};

Server.errorMessages = {
0: 'Transport unknown',
1: 'Session ID unknown',
2: 'Bad handshake method'
};

/**
* Inherits from EventEmitter.
*/
Expand Down Expand Up @@ -84,15 +100,17 @@ Server.prototype.verify = function(req){
var transport = req.query.transport;
if (!~this.transports.indexOf(transport)) {
debug('unknown transport "%s"', transport);
return false;
return Server.errors.UNKNOWN_TRANSPORT;
}

// sid check
if (req.query.sid) {
return this.clients.hasOwnProperty(req.query.sid);
return this.clients.hasOwnProperty(req.query.sid) ||
Server.errors.UNKNOWN_SID;
} else {
// handshake is GET only
return 'GET' == req.method;
return 'GET' == req.method ||
Server.errors.BAD_HANDSHAKE_METHOD;
}

return true;
Expand Down Expand Up @@ -138,9 +156,13 @@ Server.prototype.handleRequest = function(req, res){
this.prepare(req);
req.res = res;

if (!this.verify(req)) {
res.writeHead(500);
res.end();
var code = this.verify(req);
if (code !== true) {
res.writeHead(400, { 'Content-Type': 'application/json' });
res.end(JSON.stringify({
code: code,
message: Server.errorMessages[code]
}));
return this;
}

Expand Down Expand Up @@ -198,7 +220,7 @@ Server.prototype.handshake = function(transport, req){
Server.prototype.handleUpgrade = function(req, socket, head){
this.prepare(req);

if (!this.verify(req)) {
if (this.verify(req) !== true) {
socket.end();
return;
}
Expand Down
8 changes: 6 additions & 2 deletions test/engine.io.js
View file
Open in desktop
Expand Up @@ -49,7 +49,9 @@ describe('engine', function () {
server.listen(function () {
var uri = 'http://localhost:%d/engine.io/default/'.s(server.address().port);
request.get(uri, function (res) {
expect(res.status).to.be(500);
expect(res.status).to.be(400);
expect(res.body.code).to.be(0);
expect(res.body.message).to.be('Transport unknown');
server.once('close', done);
server.close();
});
Expand Down Expand Up @@ -188,7 +190,9 @@ describe('engine', function () {
server.listen(function () {
var port = server.address().port;
request.get('http://localhost:%d/engine.io/default/'.s(port), function (res) {
expect(res.status).to.be(500);
expect(res.status).to.be(400);
expect(res.body.code).to.be(0);
expect(res.body.message).to.be('Transport unknown');
request.get('http://localhost:%d/test'.s(port), function (res) {
expect(res.status).to.be(200);
expect(listeners).to.eql(2);
Expand Down
12 changes: 9 additions & 3 deletions test/server.js
View file
Open in desktop
Expand Up @@ -20,7 +20,9 @@ describe('server', function () {
request.get('http://localhost:%d/engine.io/default/'.s(port))
.query({ transport: 'tobi' }) // no tobi transport - outrageous
.end(function (res) {
expect(res.status).to.be(500);
expect(res.status).to.be(400);
expect(res.body.code).to.be(0);
expect(res.body.message).to.be('Transport unknown');
done();
});
});
Expand All @@ -32,7 +34,9 @@ describe('server', function () {
request.get('http://localhost:%d/engine.io/default/'.s(port))
.query({ transport: 'constructor' })
.end(function (res) {
expect(res.status).to.be(500);
expect(res.status).to.be(400);
expect(res.body.code).to.be(0);
expect(res.body.message).to.be('Transport unknown');
done();
});
});
Expand All @@ -43,7 +47,9 @@ describe('server', function () {
request.get('http://localhost:%d/engine.io/default/'.s(port))
.query({ transport: 'polling', sid: 'test' })
.end(function (res) {
expect(res.status).to.be(500);
expect(res.status).to.be(400);
expect(res.body.code).to.be(1);
expect(res.body.message).to.be('Session ID unknown');
done();
});
});
Expand Down