https: only use default ALPNProtocols when appropriate

mscdex · targos · commit 41f5eacc1a92 · 2024-10-02T07:57:48.000+02:00
PR-URL: #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>
diff --git a/lib/https.js b/lib/https.js
@@ -62,23 +62,25 @@ 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;
   } else if (opts == null) {
     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);
diff --git a/test/parallel/test-https-argument-of-creating.js b/test/parallel/test-https-argument-of-creating.js
@@ -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);
+}
