fixup! pass socket to server's pskCallback

nodejs · Dec 20, 2019 · 596296f · 596296f
1 parent 366a320
commit 596296f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/doc/api/tls.md b/doc/api/tls.md
@@ -1648,6 +1648,8 @@ changes:
   * `ticketKeys`: {Buffer} 48-bytes of cryptographically strong pseudo-random
     data. See [Session Resumption][] for more information.
   * `pskCallback` {Function}
+    * socket: {tls.TLSSocket} the server [`tls.TLSSocket`][] instance for
+      this connection.
     * identity: {string} identity parameter sent from the client.
     * Returns: {Buffer|TypedArray|DataView} pre-shared key that must either be
       a buffer or `null` to stop the negotiation process. Returned PSK must be

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -303,7 +303,7 @@ function onnewsession(sessionId, session) {
 
 function onPskServerCallback(identity, maxPskLen) {
   const owner = this[owner_symbol];
-  const ret = owner[kPskCallback](identity);
+  const ret = owner[kPskCallback](owner, identity);
   if (ret == null)
     return undefined;
 

diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
@@ -16,7 +16,9 @@ const TEST_DATA = 'x';
 
 const serverOptions = {
   ciphers: CIPHERS,
-  pskCallback(id) {
+  pskCallback(socket, id) {
+    assert.ok(socket instanceof tls.TLSSocket);
+    assert.ok(typeof id === 'string');
     return USERS[id];
   },
 };

diff --git a/test/parallel/test-tls-psk-server.js b/test/parallel/test-tls-psk-server.js
@@ -18,7 +18,9 @@ const IDENTITY = 'TestUser';
 const server = tls.createServer({
   ciphers: CIPHERS,
   pskIdentityHint: IDENTITY,
-  pskCallback(identity) {
+  pskCallback(socket, identity) {
+    assert.ok(socket instanceof tls.TLSSocket);
+    assert.ok(typeof identity === 'string');
     if (identity === IDENTITY)
       return Buffer.from(KEY, 'hex');
   }