[fix] Fix null payload when aborting connection (#503)

socketio · Apr 28, 2017 · e76e035 · e76e035
1 parent 935b155
commit e76e035
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/server.js b/lib/server.js
@@ -503,7 +503,7 @@ Server.prototype.attach = function (server, options) {
 
 function abortConnection (socket, code) {
   if (socket.writable) {
-    var message = Server.errorMessages.hasOwnProperty(code) ? Server.errorMessages[code] : code;
+    var message = Server.errorMessages.hasOwnProperty(code) ? Server.errorMessages[code] : (code || '');
     var length = Buffer.byteLength(message);
     socket.write(
       'HTTP/1.1 400 Bad Request\r\n' +

diff --git a/test/server.js b/test/server.js
@@ -92,6 +92,15 @@ describe('server', function () {
           });
       });
     });
+
+    it('should disallow connection that are rejected by `allowRequest`', function (done) {
+      listen({ allowRequest: function (req, fn) { fn(null, false); } }, function (port) {
+        var client = eioc('ws://localhost:%d'.s(port), { transports: ['websocket'] });
+        client.on('error', function () {
+          done();
+        });
+      });
+    });
   });
 
   describe('handshake', function () {