-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tls: TLSSocket emits 'error' on handshake failure
Removes branch that would make TLSSocket emit '_tlsError' event if error occured on handshake and control was not released, as it was never happening. Addedd test for tls.Server to ensure it still emits 'tlsClientError' as expected. Fixes: #8803 PR-URL: #8805 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Fedor Indutny <fedor@indutny.com>
- Loading branch information
1 parent
c4f0bb2
commit cf92be6
Showing
3 changed files
with
78 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
test/parallel/test-tls-server-failed-handshake-emits-clienterror.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
'use strict'; | ||
const common = require('../common'); | ||
|
||
if (!common.hasCrypto) { | ||
common.skip('missing crypto'); | ||
return; | ||
} | ||
const tls = require('tls'); | ||
const net = require('net'); | ||
const assert = require('assert'); | ||
|
||
const bonkers = Buffer.alloc(1024, 42); | ||
|
||
let tlsClientErrorEmited = false; | ||
|
||
const server = tls.createServer({}) | ||
.listen(0, function() { | ||
const c = net.connect({ port: this.address().port }, function() { | ||
c.write(bonkers); | ||
}); | ||
|
||
}).on('tlsClientError', function(e) { | ||
tlsClientErrorEmited = true; | ||
assert.ok(e instanceof Error, | ||
'Instance of Error should be passed to error handler'); | ||
assert.ok(e.message.match( | ||
/SSL routines:SSL23_GET_CLIENT_HELLO:unknown protocol/), | ||
'Expecting SSL unknown protocol'); | ||
}); | ||
|
||
setTimeout(function() { | ||
server.close(); | ||
|
||
assert.ok(tlsClientErrorEmited, | ||
'tlsClientError should be emited'); | ||
|
||
}, common.platformTimeout(200)); |
38 changes: 38 additions & 0 deletions
38
test/parallel/test-tls-socket-failed-handshake-emits-error.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
'use strict'; | ||
const common = require('../common'); | ||
|
||
if (!common.hasCrypto) { | ||
common.skip('missing crypto'); | ||
return; | ||
} | ||
const tls = require('tls'); | ||
const net = require('net'); | ||
const assert = require('assert'); | ||
|
||
const bonkers = Buffer.alloc(1024, 42); | ||
|
||
const server = net.createServer(function(c) { | ||
setTimeout(function() { | ||
const s = new tls.TLSSocket(c, { | ||
isServer: true, | ||
server: server | ||
}); | ||
|
||
s.on('error', common.mustCall(function(e) { | ||
assert.ok(e instanceof Error, | ||
'Instance of Error should be passed to error handler'); | ||
assert.ok(e.message.match( | ||
/SSL routines:SSL23_GET_CLIENT_HELLO:unknown protocol/), | ||
'Expecting SSL unknown protocol'); | ||
})); | ||
|
||
s.on('close', function() { | ||
server.close(); | ||
s.destroy(); | ||
}); | ||
}, common.platformTimeout(200)); | ||
}).listen(0, function() { | ||
const c = net.connect({port: this.address().port}, function() { | ||
c.write(bonkers); | ||
}); | ||
}); |