[fix] Use a random masking key also for zero-length frames

Author: lpinca

lib/Sender.js

@@ -90,7 +90,7 @@ class Sender {
   ping (data, mask) {
     var readOnly = true;
 
-    if (data && !Buffer.isBuffer(data)) {
+    if (!Buffer.isBuffer(data)) {
       if (data instanceof ArrayBuffer) {
         data = Buffer.from(data);
       } else if (ArrayBuffer.isView(data)) {
@@ -136,7 +136,7 @@ class Sender {
   pong (data, mask) {
     var readOnly = true;
 
-    if (data && !Buffer.isBuffer(data)) {
+    if (!Buffer.isBuffer(data)) {
       if (data instanceof ArrayBuffer) {
         data = Buffer.from(data);
       } else if (ArrayBuffer.isView(data)) {
@@ -189,7 +189,7 @@ class Sender {
     var rsv1 = options.compress;
     var readOnly = true;
 
-    if (data && !Buffer.isBuffer(data)) {
+    if (!Buffer.isBuffer(data)) {
       if (data instanceof ArrayBuffer) {
         data = Buffer.from(data);
       } else if (ArrayBuffer.isView(data)) {
@@ -202,7 +202,7 @@ class Sender {
 
     if (this.firstFragment) {
       this.firstFragment = false;
-      if (rsv1 && data && this.perMessageDeflate) {
+      if (rsv1 && this.perMessageDeflate) {
         rsv1 = data.length >= this.perMessageDeflate.threshold;
       }
       this.compress = rsv1;
@@ -288,19 +288,6 @@ class Sender {
    * @private
    */
   frameAndSend (data, options, cb) {
-    if (!data) {
-      const bytes = [options.opcode, 0];
-
-      if (options.fin) bytes[0] |= 0x80;
-      if (options.mask) {
-        bytes[1] |= 0x80;
-        bytes.push(0, 0, 0, 0);
-      }
-
-      sendFramedData(this, Buffer.from(bytes), null, cb);
-      return;
-    }
-
     const mergeBuffers = data.length < 1024 || options.mask && options.readOnly;
     var dataOffset = options.mask ? 6 : 2;
     var payloadLength = data.length;

lib/WebSocket.js

@@ -310,7 +310,7 @@ class WebSocket extends EventEmitter {
 
     if (typeof data === 'number') data = data.toString();
     if (mask === undefined) mask = !this._isServer;
-    this._sender.ping(data, mask);
+    this._sender.ping(data || constants.EMPTY_BUFFER, mask);
   }
 
   /**
@@ -329,7 +329,7 @@ class WebSocket extends EventEmitter {
 
     if (typeof data === 'number') data = data.toString();
     if (mask === undefined) mask = !this._isServer;
-    this._sender.pong(data, mask);
+    this._sender.pong(data || constants.EMPTY_BUFFER, mask);
   }
 
   /**
@@ -357,20 +357,19 @@ class WebSocket extends EventEmitter {
     }
 
     if (typeof data === 'number') data = data.toString();
-    else if (!data) data = '';
 
     const opts = Object.assign({
-      fin: true,
       binary: typeof data !== 'string',
       mask: !this._isServer,
-      compress: true
+      compress: true,
+      fin: true
     }, options);
 
     if (!this.extensions[PerMessageDeflate.extensionName]) {
       opts.compress = false;
     }
 
-    this._sender.send(data, opts, cb);
+    this._sender.send(data || constants.EMPTY_BUFFER, opts, cb);
   }
 
   /**

test/Sender.test.js

@@ -178,30 +178,6 @@ describe('Sender', function () {
       sender.send('123', { compress: true, fin: true });
     });
 
-    it('compresses null as first fragment', function (done) {
-      const fragments = [];
-      const perMessageDeflate = new PerMessageDeflate({ threshold: 0 });
-      const sender = new Sender({
-        write: (data) => {
-          fragments.push(data);
-          if (fragments.length !== 2) return;
-
-          assert.strictEqual(fragments[0][0] & 0x40, 0x40);
-          assert.strictEqual(fragments[0].length, 3);
-          assert.strictEqual(fragments[1][0] & 0x40, 0x00);
-          assert.strictEqual(fragments[1].length, 8);
-          done();
-        }
-      }, {
-        'permessage-deflate': perMessageDeflate
-      });
-
-      perMessageDeflate.accept([{}]);
-
-      sender.send(null, { compress: true, fin: false });
-      sender.send('data', { compress: true, fin: true });
-    });
-
     it('compresses empty buffer as first fragment', function (done) {
       const fragments = [];
       const perMessageDeflate = new PerMessageDeflate({ threshold: 0 });
@@ -226,30 +202,6 @@ describe('Sender', function () {
       sender.send('data', { compress: true, fin: true });
     });
 
-    it('compresses null last fragment', function (done) {
-      const fragments = [];
-      const perMessageDeflate = new PerMessageDeflate({ threshold: 0 });
-      const sender = new Sender({
-        write: (data) => {
-          fragments.push(data);
-          if (fragments.length !== 2) return;
-
-          assert.strictEqual(fragments[0][0] & 0x40, 0x40);
-          assert.strictEqual(fragments[0].length, 12);
-          assert.strictEqual(fragments[1][0] & 0x40, 0x00);
-          assert.strictEqual(fragments[1].length, 3);
-          done();
-        }
-      }, {
-        'permessage-deflate': perMessageDeflate
-      });
-
-      perMessageDeflate.accept([{}]);
-
-      sender.send('data', { compress: true, fin: false });
-      sender.send(null, { compress: true, fin: true });
-    });
-
     it('compresses empty buffer as last fragment', function (done) {
       const fragments = [];
       const perMessageDeflate = new PerMessageDeflate({ threshold: 0 });

test/WebSocket.test.js

@@ -811,7 +811,7 @@ describe('WebSocket', function () {
         ws.on('open', () => ws.send());
 
         srv.on('message', (message, flags) => {
-          assert.strictEqual(message, '');
+          assert.ok(message.equals(Buffer.alloc(0)));
           srv.close(done);
           ws.terminate();
         });