tls: do not wrap net.Socket with StreamWrap

Fixes: #3655 PR-URL: #12799 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
nodejs · May 15, 2017 · b23d414 · b23d414
1 parent ef16319
commit b23d414
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -31,7 +31,6 @@ const util = require('util');
 const common = require('_tls_common');
 const StreamWrap = require('_stream_wrap').StreamWrap;
 const Buffer = require('buffer').Buffer;
-const Duplex = require('stream').Duplex;
 const debug = util.debuglog('tls');
 const Timer = process.binding('timer_wrap').Timer;
 const tls_wrap = process.binding('tls_wrap');
@@ -275,12 +274,10 @@ function TLSSocket(socket, options) {
 
   // Wrap plain JS Stream into StreamWrap
   var wrap;
-  if (!(socket instanceof net.Socket) && socket instanceof Duplex)
-    wrap = new StreamWrap(socket);
-  else if ((socket instanceof net.Socket) && !socket._handle)
-    wrap = new StreamWrap(socket);
-  else
+  if ((socket instanceof net.Socket && socket._handle) || !socket)
     wrap = socket;
+  else
+    wrap = new StreamWrap(socket);
 
   // Just a documented property to make secure sockets
   // distinguishable from regular ones.

diff --git a/test/parallel/test-tls-wrap-event-emmiter.js b/test/parallel/test-tls-wrap-event-emmiter.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/*
+ * Issue: https://github.com/nodejs/node/issues/3655
+ * Test checks if we get exception instead of runtime error
+ */
+
+require('../common');
+const assert = require('assert');
+
+const TlsSocket = require('tls').TLSSocket;
+const EventEmitter = require('events').EventEmitter;
+assert.throws(
+  () => { new TlsSocket(new EventEmitter()); },
+  /^TypeError: this\.stream\.pause is not a function/
+);