mirror of
https://github.com/zebrajr/node.git
synced 2026-01-15 12:15:26 +00:00
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: https://github.com/nodejs/node/issues/41501 PR-URL: https://github.com/nodejs/node/pull/41523 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
This commit is contained in:
@@ -407,8 +407,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;
|
||||
@@ -420,7 +422,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)) {
|
||||
|
||||
Reference in New Issue
Block a user