1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tls: better error message for socket disconnect

Browse Source 
The error emitted when a connection is closed before the
TLS handshake completes seemed rather unspefic by just saying
`socket hang up`.

Use a more verbose message, that also indicates that this is
a purely client-side error, and remove a misleading comment.

PR-URL: https://github.com/nodejs/node/pull/18989
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Anna Henningsen 2018-02-25 21:43:23 +01:00 committed by Anatoli Papirovski
parent 1ebd966d2c
commit eda702104b
No known key found for this signature in database
GPG Key ID: 614E2E1ABEB4B2C0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/_tls_wrap.js
View File

@ -1074,7 +1074,6 @@ function onConnectSecure() {
this.emit('secureConnect'); this.emit('secureConnect');
} }
// Uncork incoming data
this.removeListener('end', onConnectEnd); this.removeListener('end', onConnectEnd);
} }
@ -1083,7 +1082,8 @@ function onConnectEnd() {
if (!this._hadError) { if (!this._hadError) {
const options = this[kConnectOptions]; const options = this[kConnectOptions];
this._hadError = true; this._hadError = true;
const error = new Error('socket hang up'); const error = new Error('Client network socket disconnected before ' +
'secure TLS connection was established');
error.code = 'ECONNRESET'; error.code = 'ECONNRESET';
error.path = options.path; error.path = options.path;
error.host = options.host; error.host = options.host;

2
test/parallel/test-tls-empty-sni-context.js
View File

@ -29,6 +29,6 @@ const server = tls.createServer(options, (c) => {
}, common.mustNotCall()); }, common.mustNotCall());
c.on('error', common.mustCall((err) => { c.on('error', common.mustCall((err) => {
assert(/socket hang up/.test(err.message)); assert(/Client network socket disconnected/.test(err.message));
})); }));
})); }));

4
test/parallel/test-tls-sni-option.js
View File

@ -175,7 +175,9 @@ process.on('exit', function() {
]); ]);
assert.deepStrictEqual(clientResults, [true, true, true, false, false]); assert.deepStrictEqual(clientResults, [true, true, true, false, false]);
assert.deepStrictEqual(clientErrors, [ assert.deepStrictEqual(clientErrors, [
null, null, null, null, 'socket hang up' null, null, null, null,
'Client network socket disconnected before secure TLS ' +
'connection was established'
]); ]);
assert.deepStrictEqual(serverErrors, [ assert.deepStrictEqual(serverErrors, [
null, null, null, null, 'Invalid SNI context' null, null, null, null, 'Invalid SNI context'