-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tls: set tlsSocket.servername as early as possible
This commit makes `TLSSocket` set the `servername` property on `SSL_CTX_set_tlsext_servername_callback` so that we could get it later even if errors happen. Fixes: #27699 PR-URL: #27759 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
- Loading branch information
Showing
3 changed files
with
68 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
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
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,56 @@ | ||
'use strict'; | ||
const common = require('../common'); | ||
if (!common.hasCrypto) | ||
common.skip('missing crypto'); | ||
|
||
const assert = require('assert'); | ||
const tls = require('tls'); | ||
|
||
// We could get the `tlsSocket.servername` even if the event of "tlsClientError" | ||
// is emitted. | ||
|
||
const serverOptions = { | ||
requestCert: true, | ||
rejectUnauthorized: false, | ||
SNICallback: function(servername, callback) { | ||
if (servername === 'c.another.com') { | ||
callback(null, {}); | ||
} else { | ||
callback(new Error('Invalid SNI context'), null); | ||
} | ||
} | ||
}; | ||
|
||
function test(options) { | ||
const server = tls.createServer(serverOptions, common.mustNotCall()); | ||
|
||
server.on('tlsClientError', common.mustCall((err, socket) => { | ||
assert.strictEqual(err.message, 'Invalid SNI context'); | ||
// The `servername` should match. | ||
assert.strictEqual(socket.servername, options.servername); | ||
})); | ||
|
||
server.listen(0, () => { | ||
options.port = server.address().port; | ||
const client = tls.connect(options, common.mustNotCall()); | ||
|
||
client.on('error', common.mustCall((err) => { | ||
assert.strictEqual(err.message, 'Client network socket' + | ||
' disconnected before secure TLS connection was established'); | ||
})); | ||
|
||
client.on('close', common.mustCall(() => server.close())); | ||
}); | ||
} | ||
|
||
test({ | ||
port: undefined, | ||
servername: 'c.another.com', | ||
rejectUnauthorized: false | ||
}); | ||
|
||
test({ | ||
port: undefined, | ||
servername: 'c.wrong.com', | ||
rejectUnauthorized: false | ||
}); |