From 2139721f390e81b838f8d47de8bd2ef620c475aa Mon Sep 17 00:00:00 2001 From: Paolo Insogna Date: Fri, 20 Nov 2026 07:51:20 +0100 Subject: [PATCH] tls: match SNI contexts ignoring a terminal dot The names given to `server.addContext()` and the server name sent by the client were compared as written, so `host.example.` did not match a context added for `host.example`, although both name the same host. Remove one terminal dot from both before matching, so that the same context is selected. Assisted-By: OpenAI GPT-5.6 Sol Signed-off-by: Paolo Insogna --- lib/internal/tls/wrap.js | 14 +++- test/parallel/test-tls-sni-trailing-dot.js | 74 ++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 test/parallel/test-tls-sni-trailing-dot.js diff --git a/lib/internal/tls/wrap.js b/lib/internal/tls/wrap.js index 9444652c66d4..f38ac8dcb126 100644 --- a/lib/internal/tls/wrap.js +++ b/lib/internal/tls/wrap.js @@ -28,6 +28,8 @@ const { ObjectSetPrototypeOf, ReflectApply, RegExp, + StringPrototypeEndsWith, + StringPrototypeSlice, Symbol, SymbolFor, } = primordials; @@ -1752,13 +1754,22 @@ Server.prototype.setTicketKeys = function setTicketKeys(keys) { }; // SNI Contexts High-Level API + +// A terminal dot denotes the DNS root and does not change the name: remove it +// so that 'host.example.' selects the context registered for 'host.example'. +function removeTerminalDot(servername) { + return StringPrototypeEndsWith(servername, '.') ? + StringPrototypeSlice(servername, 0, -1) : + servername; +} + Server.prototype.addContext = function(servername, context) { if (!servername) { throw new ERR_TLS_REQUIRED_SERVER_NAME(); } const re = new RegExp(`^${ - servername + removeTerminalDot(servername) .replace(/([.^$+?\-\\[\]{}])/g, '\\$1') .replaceAll('*', '[^.]*') }$`, 'i'); @@ -1782,6 +1793,7 @@ Server.prototype[EE.captureRejectionSymbol] = function( function SNICallback(servername, callback) { const contexts = this.server._contexts; + servername = removeTerminalDot(servername); for (let i = contexts.length - 1; i >= 0; --i) { const elem = contexts[i]; diff --git a/test/parallel/test-tls-sni-trailing-dot.js b/test/parallel/test-tls-sni-trailing-dot.js new file mode 100644 index 000000000000..ba0b8bd52dc2 --- /dev/null +++ b/test/parallel/test-tls-sni-trailing-dot.js @@ -0,0 +1,74 @@ +'use strict'; +const common = require('../common'); +if (!common.hasCrypto) + common.skip('missing crypto'); + +// A server name with a terminal root dot refers to the same host as the +// name without it, so it must select the same SNI context. The context +// that was selected is detected from the server certificate presented to +// the client. + +const assert = require('assert'); +const tls = require('tls'); +const fixtures = require('../common/fixtures'); + +const defaultCreds = { + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readKey('agent1-cert.pem'), +}; +const sniCreds = { + key: fixtures.readKey('agent2-key.pem'), + cert: fixtures.readKey('agent2-cert.pem'), +}; + +function getServerCommonName(port, servername, version) { + return new Promise((resolve, reject) => { + const socket = tls.connect({ + port, + servername, + rejectUnauthorized: false, + minVersion: version, + maxVersion: version, + }, common.mustCall(() => { + const { CN } = socket.getPeerCertificate().subject; + socket.end(); + resolve(CN); + })); + socket.on('error', reject); + }); +} + +const cases = [ + // [registered name, names a client may send] + ['host.example', ['host.example', 'host.example.']], + ['host.example.', ['host.example', 'host.example.']], + ['*.host.example', ['a.host.example', 'a.host.example.']], +]; + +async function test(version, registered, servernames) { + const server = tls.createServer({ + ...defaultCreds, + minVersion: version, + maxVersion: version, + }, (socket) => socket.end()); + server.addContext(registered, sniCreds); + await new Promise((resolve) => server.listen(0, resolve)); + + const { port } = server.address(); + for (const servername of servernames) { + assert.strictEqual(await getServerCommonName(port, servername, version), + 'agent2', `${version} ${registered} ${servername}`); + } + + // A name that matches no context still uses the default one. + assert.strictEqual(await getServerCommonName(port, 'other.example.', version), + 'agent1', `${version} ${registered} other.example.`); + await new Promise((resolve) => server.close(resolve)); +} + +(async () => { + for (const version of ['TLSv1.2', 'TLSv1.3']) { + for (const [registered, servernames] of cases) + await test(version, registered, servernames); + } +})().then(common.mustCall());