From 3f21973baa43caa8cae58ad8546772887c087fd9 Mon Sep 17 00:00:00 2001 From: Valters Jansons Date: Fri, 14 Jan 2022 16:19:09 +0200 Subject: [PATCH] tls: avoid throw in onerror for bad TLSSocket obj TLSWrap.onerror has a helpful debug() call built in to it. However in case of a malformed TLSSocket object, where the `_tlsOptions` value is an unexpected `undefined`, accessing `_tlsOptions.isServer` causes a TypeError to be thrown. This commit ensures that the debug() call properly logs the state as 'unknown', instead of the two 'server' and 'client' choices previously available. Additionally, onerror branching is adjusted to allow such `undefined` options object, by use of optional chaining. Other methods are not being adjusted, as such a case of `undefined` options is not viable during regular processing of the TLSSocket. Fixes: nodejs/node#41501 --- lib/_tls_wrap.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index 57399c602a10bb5..dba03a50fe66a7f 100644 --- a/lib/_tls_wrap.js +++ b/lib/_tls_wrap.js @@ -408,8 +408,10 @@ function onocspresponse(resp) { function onerror(err) { const owner = this[owner_symbol]; debug('%s onerror %s had? %j', - owner._tlsOptions.isServer ? 'server' : 'client', err, - owner._hadError); + (typeof owner._tlsOptions === 'object' && owner._tlsOptions !== null) ? + owner._tlsOptions.isServer ? 'server' : 'client' : + 'unknown', + err, owner._hadError); if (owner._hadError) return; @@ -421,7 +423,7 @@ function onerror(err) { // When handshake fails control is not yet released, // so self._tlsError will return null instead of actual error owner.destroy(err); - } else if (owner._tlsOptions.isServer && + } else if (owner._tlsOptions?.isServer && owner._rejectUnauthorized && RegExpPrototypeTest(/peer did not return a certificate/, err.message)) {