Skip to content

Commit

Permalink
http2: support ALPNCallback option
Browse files Browse the repository at this point in the history
PR-URL: #56187
Fixes: #55994
Refs: #45190
Reviewed-By: Tim Perry <pimterry@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
ZYSzys authored and ruyadorno committed Dec 20, 2024
1 parent c365263 commit 18fb548
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 3 deletions.
10 changes: 7 additions & 3 deletions lib/internal/http2/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -3136,9 +3136,13 @@ function initializeOptions(options) {

function initializeTLSOptions(options, servername) {
options = initializeOptions(options);
options.ALPNProtocols = ['h2'];
if (options.allowHTTP1 === true)
options.ALPNProtocols.push('http/1.1');

if (!options.ALPNCallback) {
options.ALPNProtocols = ['h2'];
if (options.allowHTTP1 === true)
options.ALPNProtocols.push('http/1.1');
}

if (servername !== undefined && !options.servername)
options.servername = servername;
return options;
Expand Down
47 changes: 47 additions & 0 deletions test/parallel/test-http2-alpn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
'use strict';
const common = require('../common');
const fixtures = require('../common/fixtures');

// This test verifies that http2 server support ALPNCallback option.

if (!common.hasCrypto) common.skip('missing crypto');

const assert = require('assert');
const h2 = require('http2');
const tls = require('tls');

{
// Server sets two incompatible ALPN options:
assert.throws(() => h2.createSecureServer({
ALPNCallback: () => 'a',
ALPNProtocols: ['b', 'c']
}), (error) => error.code === 'ERR_TLS_ALPN_CALLBACK_WITH_PROTOCOLS');
}

{
const server = h2.createSecureServer({
key: fixtures.readKey('rsa_private.pem'),
cert: fixtures.readKey('rsa_cert.crt'),
ALPNCallback: () => 'a',
});

server.on(
'secureConnection',
common.mustCall((socket) => {
assert.strictEqual(socket.alpnProtocol, 'a');
socket.end();
server.close();
})
);

server.listen(0, function() {
const client = tls.connect({
port: server.address().port,
rejectUnauthorized: false,
ALPNProtocols: ['a'],
}, common.mustCall(() => {
assert.strictEqual(client.alpnProtocol, 'a');
client.end();
}));
});
}

0 comments on commit 18fb548

Please sign in to comment.