tls: Closing parent socket also closes the tls sock

Author: dnakamura

lib/_tls_wrap.js

@@ -228,7 +228,7 @@ function onocspresponse(resp) {
 function TLSSocket(socket, options) {
   // Disallow wrapping TLSSocket in TLSSocket
   assert(!(socket instanceof TLSSocket));
-
+  var self = this;
   net.Socket.call(this, {
     handle: socket && socket._handle,
     allowHalfOpen: socket && socket.allowHalfOpen,
@@ -238,6 +238,7 @@ function TLSSocket(socket, options) {
 
   if (socket) {
     this._parent = socket;
+    socket._destroy = function(exception){self._destroy(exception)};
     // To prevent assertion in afterConnect()
     this._connecting = socket._connecting;
   }

lib/net.js

@@ -456,7 +456,8 @@ Socket.prototype._destroy = function(exception, cb) {
     if (cb) cb(exception);
     if (exception && !self._writableState.errorEmitted) {
       process.nextTick(function() {
-        self.emit('error', exception);
+        for(var s = self; s !== null; s = s._parent)
+          s.emit('error', exception);
       });
       self._writableState.errorEmitted = true;
     }
@@ -468,12 +469,11 @@ Socket.prototype._destroy = function(exception, cb) {
     return;
   }
 
-  self._connecting = false;
-
-  this.readable = this.writable = false;
-
-  for (var s = this; s !== null; s = s._parent)
-    timers.unenroll(s);
+  for (var s = this; s !== null; s = s._parent){
+     timers.unenroll(s);
+     s._connecting = false;
+     s.readable = s.writable = false;
+  }
 
   debug('close');
   if (this._handle) {
@@ -482,16 +482,22 @@ Socket.prototype._destroy = function(exception, cb) {
     var isException = exception ? true : false;
     this._handle.close(function() {
       debug('emit close');
-      self.emit('close', isException);
+      for(var s = self; s !== null; s = s._parent)
+        s.emit('close', isException);
     });
     this._handle.onread = noop;
-    this._handle = null;
+    for(var s = this; s !== null; s = s._parent){
+        s._handle = null;
+    }
   }
 
   // we set destroyed to true before firing error callbacks in order
   // to make it re-entrance safe in case Socket.prototype.destroy()
   // is called within callbacks
-  this.destroyed = true;
+  for(var s = this; s !== null; s = s._parent){
+    s.destroyed = true;
+  }
+
   fireErrorCallbacks();
 
   if (this.server) {

test/simple/test-tls-destroy-socket.js

@@ -0,0 +1,40 @@
+if (!process.versions.openssl) {
+  console.error('Skipping because node compiled without OpenSSL.');
+  process.exit(0);
+}
+
+var common = require('../common');
+var assert = require('assert');
+var tls = require('tls');
+var fs = require('fs');
+
+var options = {
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem')
+};
+
+var normalSock = null;
+var hasError = false;
+
+var server = tls.createServer(options, function(secureSock) {
+    secureSock.on('error', function(){hasError = true});
+    normalSock.destroy();
+    setTimeout(function(){
+        secureSock.write('Test!', function(err){ assert.ok(err);});
+    }, 200);
+});
+
+server.on('connection', function(sock){
+    normalSock = sock;
+});
+
+server.listen(common.PORT, function() {
+  var c = tls.connect(common.PORT, {rejectUnauthorized: false});
+  c.on('error',function(){}); // ignore client errors
+
+  c.on('end', function() {
+    server.close();
+  });
+
+  process.on('exit', function(){assert(hasError)});
+});