nodejs
diff --git a/Collapse file
‎doc/api/errors.md‎
Copy file name to clipboardExpand all lines: doc/api/errors.md
+6Lines changed: 6 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/errors.md‎
Copy file name to clipboardExpand all lines: doc/api/errors.md
+6Lines changed: 6 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎lib/internal/errors.js‎
Copy file name to clipboardExpand all lines: lib/internal/errors.js
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎lib/internal/errors.js‎
Copy file name to clipboardExpand all lines: lib/internal/errors.js
+2Lines changed: 2 additions & 0 deletions
diff --git a/Collapse file
‎lib/internal/http2/core.js‎
Copy file name to clipboardExpand all lines: lib/internal/http2/core.js
+10-2Lines changed: 10 additions & 2 deletions b/Collapse file
‎lib/internal/http2/core.js‎
Copy file name to clipboardExpand all lines: lib/internal/http2/core.js
+10-2Lines changed: 10 additions & 2 deletions
diff --git a/Collapse file
‎test/parallel/test-http2-unbound-socket-proxy.js‎
Copy file name to clipboard
+69Lines changed: 69 additions & 0 deletions b/Collapse file
‎test/parallel/test-http2-unbound-socket-proxy.js‎
Copy file name to clipboard
+69Lines changed: 69 additions & 0 deletions
@@ -843,6 +843,12 @@ The `Http2Session` settings canceled.
 An attempt was made to connect a `Http2Session` object to a `net.Socket` or
 `tls.TLSSocket` that had already been bound to another `Http2Session` object.
 
+<a id="ERR_HTTP2_SOCKET_UNBOUND"></a>
+### ERR_HTTP2_SOCKET_UNBOUND
+
+An attempt was made to use the `socket` property of an `Http2Session` that
+has already been closed.
+
 <a id="ERR_HTTP2_STATUS_101"></a>
 ### ERR_HTTP2_STATUS_101
 
 
@@ -338,6 +338,8 @@ E('ERR_HTTP2_SESSION_ERROR', 'Session closed with error code %s');
 E('ERR_HTTP2_SETTINGS_CANCEL', 'HTTP2 session settings canceled');
 E('ERR_HTTP2_SOCKET_BOUND',
   'The socket is already bound to an Http2Session');
+E('ERR_HTTP2_SOCKET_UNBOUND',
+  'The socket has been disconnected from the Http2Session');
 E('ERR_HTTP2_STATUS_101',
   'HTTP status code 101 (Switching Protocols) is forbidden in HTTP/2');
 E('ERR_HTTP2_STATUS_INVALID', 'Invalid status code: %s');
 
@@ -641,12 +641,17 @@ const proxySocketHandler = {
         throw new errors.Error('ERR_HTTP2_NO_SOCKET_MANIPULATION');
       default:
         const socket = session[kSocket];
+        if (socket === undefined)
+          throw new errors.Error('ERR_HTTP2_SOCKET_UNBOUND');
         const value = socket[prop];
         return typeof value === 'function' ? value.bind(socket) : value;
     }
   },
   getPrototypeOf(session) {
-    return Reflect.getPrototypeOf(session[kSocket]);
+    const socket = session[kSocket];
+    if (socket === undefined)
+      throw new errors.Error('ERR_HTTP2_SOCKET_UNBOUND');
+    return Reflect.getPrototypeOf(socket);
   },
   set(session, prop, value) {
     switch (prop) {
@@ -662,7 +667,10 @@ const proxySocketHandler = {
       case 'write':
         throw new errors.Error('ERR_HTTP2_NO_SOCKET_MANIPULATION');
       default:
-        session[kSocket][prop] = value;
+        const socket = session[kSocket];
+        if (socket === undefined)
+          throw new errors.Error('ERR_HTTP2_SOCKET_UNBOUND');
+        socket[prop] = value;
         return true;
     }
   }
 
@@ -0,0 +1,69 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const http2 = require('http2');
+const net = require('net');
+
+const server = http2.createServer();
+server.on('stream', common.mustCall((stream) => {
+  stream.respond();
+  stream.end('ok');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const client = http2.connect(`http://localhost:${server.address().port}`);
+  const socket = client.socket;
+  const req = client.request();
+  req.resume();
+  req.on('close', common.mustCall(() => {
+    client.close();
+    server.close();
+
+    // Tests to make sure accessing the socket proxy fails with an
+    // informative error.
+    setImmediate(common.mustCall(() => {
+      common.expectsError(() => {
+        socket.example;
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.example = 1;
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket instanceof net.Socket;
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.ref();
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.unref();
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.setEncoding();
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.setKeepAlive();
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+      common.expectsError(() => {
+        socket.setNoDelay();
+      }, {
+        code: 'ERR_HTTP2_SOCKET_UNBOUND'
+      });
+    }));
+  }));
+}));