Skip to content
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

Jump to bottom

http2: set origin name correctly when servername is empty #42838

Merged
merged 1 commit into from
May 25, 2022
Merged

http2: set origin name correctly when servername is empty #42838

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
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 @@ -3119,7 +3119,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)
Copy link
Contributor

@austinkelleher austinkelleher Apr 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the referenced PR had the same change and @lpinca had left a comment about the behavior. https://github.com/nodejs/node/pull/39934/files#r699529426

I'm not entirely sure what the desired behavior is here but it's probably worth discussing. In the comment, @lpinca calls out the following commit: 98e9de7

Looking at the latest https documentation, you can see that servername is still documented the same way for https.Agent:

node/doc/api/https.md

Line 80 in 9cd2c27

* `servername` {string} the value of

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your reply, I understand the problem much better now, although I think it is still wired we return https://false.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any conclusion yet on what needs to be done for this?

options.servername = servername;
return options;
}
Expand Down
6 changes: 6 additions & 0 deletions test/parallel/test-http2-create-client-secure-session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,9 @@ verifySecureSession(
loadKey('agent1-cert.pem'),
loadKey('ca1-cert.pem'),
{ servername: 'agent1' });

verifySecureSession(
loadKey('agent8-key.pem'),
loadKey('agent8-cert.pem'),
loadKey('fake-startcom-root-cert.pem'),
{ servername: '' });