Skip to content

Fix: Invalid HTTP/2 origin set when servername is empty #39919 #39934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Narasimha1997 wants to merge 1 commit into from
Closed

Fix: Invalid HTTP/2 origin set when servername is empty #39919 #39934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
http2: set origin name correctly when servername is empty 
Fixes: #39919
  • Loading branch information
@Narasimha1997
Narasimha1997 committed Aug 30, 2021
commit c43b614cab9abca8a3a6449f7d025d5476749430
2 changes: 1 addition & 1 deletion lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,7 @@ function initializeTLSOptions(options, servername) {
options.ALPNProtocols = ['h2'];
if (options.allowHTTP1 === true)
ArrayPrototypePush(options.ALPNProtocols, 'http/1.1');
if (servername !== undefined && options.servername === undefined)
if (servername !== undefined && !options.servername)
options.servername = servername;
return options;
}
Expand Down
42 changes: 42 additions & 0 deletions test/internet/test-http2-https-origin-string-correctness.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
'use strict';

// Ref: https://github.com/nodejs/node/issues/39919

const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

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

function _verifyOriginSet(session, originString) {
session.once('remoteSettings', () => {
assert.strictEqual(typeof session.originSet, 'object');
assert.strictEqual(session.originSet.length, 1);
assert.strictEqual(session.originSet[0], originString);
session.close();
});
session.once('error', (error) => {
assert.strictEqual(error.code, 'ECONNREFUSED');
session.close();
});
}

function withServerName() {
const session = http2.connect('https://1.1.1.1', { servername: 'cloudflare-dns.com' });
_verifyOriginSet(session, 'https://cloudflare-dns.com');
}

function withEmptyServerName() {
const session = http2.connect('https://1.1.1.1', { servername: '' });
_verifyOriginSet(session, 'https://1.1.1.1');
}

function withoutServerName() {
const session = http2.connect('https://1.1.1.1');
_verifyOriginSet(session, 'https://1.1.1.1');
}

withServerName();
withEmptyServerName();
withoutServerName();