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.

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

tls: fix SNICallback without .server option #17835

Closed

Conversation

addaleax
Copy link
Member

options.server only needs to be set when its contents are actually being inspected.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

tls

`options.server` only needs to be set when its
contents are actually being inspected.
@nodejs-github-bot nodejs-github-bot added the tls Issues and PRs related to the tls subsystem. label Dec 23, 2017
new tls.TLSSocket(serverSide, {
isServer: true,
SNICallback: common.mustCall((servername, cb) => {
assert.strictEqual('www.google.com', servername);
Copy link
Member

Choose a reason for hiding this comment

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

Nit: can you please swap the args?

@addaleax
Copy link
Member Author

@addaleax addaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Dec 27, 2017
addaleax added a commit that referenced this pull request Dec 27, 2017
`options.server` only needs to be set when its
contents are actually being inspected.

PR-URL: #17835
Reviewed-By: Timothy Gu <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@addaleax
Copy link
Member Author

Landed in 46510f5

@addaleax addaleax closed this Dec 27, 2017
@addaleax addaleax deleted the tls-socket-sni-without-server branch December 27, 2017 18:56
@addaleax addaleax removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Dec 27, 2017
MylesBorins pushed a commit that referenced this pull request Jan 8, 2018
`options.server` only needs to be set when its
contents are actually being inspected.

PR-URL: #17835
Reviewed-By: Timothy Gu <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 9, 2018
`options.server` only needs to be set when its
contents are actually being inspected.

PR-URL: #17835
Reviewed-By: Timothy Gu <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 9, 2018
`options.server` only needs to be set when its
contents are actually being inspected.

PR-URL: #17835
Reviewed-By: Timothy Gu <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@MylesBorins MylesBorins mentioned this pull request Jan 10, 2018
@gibfahn
Copy link
Member

gibfahn commented Jan 24, 2018

This has test failures on 6.x and 8.x, @addaleax would you be willing to backport? I assume it's a simple fix.

=== release test-tls-socket-snicallback-without-server ===                     
Path: parallel/test-tls-socket-snicallback-without-server
Mismatched <anonymous> function calls. Expected exactly 1, actual 0.
    at Object.exports.mustCall (/Users/gib/wrk/com/DANGER/node/test/common/index.js:499:10)
    at Object.<anonymous> (/Users/gib/wrk/com/DANGER/node/test/parallel/test-tls-socket-snicallback-without-server.js:18:23)
    at Module._compile (module.js:643:30)
    at Object.Module._extensions..js (module.js:654:10)
    at Module.load (module.js:556:32)
    at tryModuleLoad (module.js:499:12)
    at Function.Module._load (module.js:491:3)
    at Function.Module.runMain (module.js:684:10)
    at startup (bootstrap_node.js:188:16)
Command: out/Release/node /Users/gib/wrk/com/DANGER/node/test/parallel/test-tls-socket-snicallback-without-server.js
[00:00|% 100|+   0|-   1]: Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tls Issues and PRs related to the tls subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants