fix protocol violations and improve error handling (fixes socketio#1880)

rauchg · rauchg · commit 4e4bbf918ebd · 2014-11-21T04:16:37.000+01:00
diff --git a/lib/client.js b/lib/client.js
@@ -42,9 +42,12 @@ function Client(server, conn){
 Client.prototype.setup = function(){
   this.onclose = this.onclose.bind(this);
   this.ondata = this.ondata.bind(this);
+  this.onerror = this.onerror.bind(this);
   this.ondecoded = this.ondecoded.bind(this);
+
   this.decoder.on('decoded', this.ondecoded);
   this.conn.on('data', this.ondata);
+  this.conn.on('error', this.onerror);
   this.conn.on('close', this.onclose);
 };
 
@@ -167,7 +170,12 @@ Client.prototype.packet = function(packet, preEncoded, volatile){
  */
 
 Client.prototype.ondata = function(data){
-  this.decoder.add(data);
+  // try/catch is needed for protocol violations (GH-1880)
+  try {
+    this.decoder.add(data);
+  } catch(e) {
+    this.onerror(e);
+  }
 };
 
 /**
@@ -189,6 +197,20 @@ Client.prototype.ondecoded = function(packet) {
   }
 };
 
+/**
+ * Handles an error.
+ *
+ * @param {Objcet} error object
+ * @api private
+ */
+
+Client.prototype.onerror = function(err){
+  this.sockets.forEach(function(socket){
+    socket.onerror(err);
+  });
+  this.onclose('client error');
+};
+
 /**
  * Called upon transport close.
  *
@@ -219,6 +241,7 @@ Client.prototype.onclose = function(reason){
 
 Client.prototype.destroy = function(){
   this.conn.removeListener('data', this.ondata);
+  this.conn.removeListener('error', this.onerror);
   this.conn.removeListener('close', this.onclose);
   this.decoder.removeListener('decoded', this.ondecoded);
 };
diff --git a/lib/socket.js b/lib/socket.js
@@ -380,10 +380,21 @@ Socket.prototype.ondisconnect = function(){
   this.onclose('client namespace disconnect');
 };
 
+/**
+ * Handles a client error.
+ *
+ * @api private
+ */
+
+Socket.prototype.onerror = function(err){
+  this.emit('error', err);
+};
+
 /**
  * Called upon closing. Called by `Client`.
  *
  * @param {String} reason
+ * @param {Error} optional error object
  * @api private
  */
 
diff --git a/test/socket.io.js b/test/socket.io.js
@@ -639,6 +639,39 @@ describe('socket.io', function(){
       });
     });
 
+    it('should error with null messages', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.on('message', function(a){
+            expect(a).to.be(null);
+            done();
+          });
+          socket.send(null);
+        });
+      });
+    });
+
+    it('should handle transport null messages', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.on('error', function(err){
+            expect(err).to.be.an(Error);
+            s.on('disconnect', function(reason){
+              expect(reason).to.be('client error');
+              done();
+            });
+          });
+          s.client.ondata(null);
+        });
+      });
+    });
+
     it('should emit events', function(done){
       var srv = http();
       var sio = io(srv);
