https: only use default ALPNProtocols when appropriate

PR-URL: https://github.com/nodejs/node/pull/54411
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Paolo Insogna <paolo@cowtech.it>
Reviewed-By: Tim Perry <pimterry@gmail.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
mscdex 2024-08-31 23:04:10 -04:00 committed by GitHub
parent 826b7533e8
commit 71b36b3068
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions

View File

@ -62,6 +62,7 @@ const { validateObject } = require('internal/validators');
function Server(opts, requestListener) {
if (!(this instanceof Server)) return new Server(opts, requestListener);
let ALPNProtocols = ['http/1.1'];
if (typeof opts === 'function') {
requestListener = opts;
opts = kEmptyObject;
@ -69,16 +70,17 @@ function Server(opts, requestListener) {
opts = kEmptyObject;
} else {
validateObject(opts, 'options');
// Only one of ALPNProtocols and ALPNCallback can be set, so make sure we
// only set a default ALPNProtocols if the caller has not set either of them
if (opts.ALPNProtocols || opts.ALPNCallback)
ALPNProtocols = undefined;
}
FunctionPrototypeCall(storeHTTPOptions, this, opts);
FunctionPrototypeCall(tls.Server, this,
{
noDelay: true,
// http/1.0 is not defined as Protocol IDs in IANA
// https://www.iana.org/assignments/tls-extensiontype-values
// /tls-extensiontype-values.xhtml#alpn-protocol-ids
ALPNProtocols: ['http/1.1'],
ALPNProtocols,
...opts,
},
_connectionListener);

View File

@ -45,3 +45,14 @@ const dftProtocol = {};
0);
assert.strictEqual(server.listeners('request').length, 0);
}
// Validate that `createServer` only uses defaults when appropriate
{
const ALPNCallback = () => {};
const server = https.createServer({
ALPNCallback,
});
assert.strictEqual(server.ALPNProtocols, undefined);
assert.strictEqual(server.ALPNCallback, ALPNCallback);
}