Skip to content

tls: set tlsSocket.servername as early as possible #27759

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
oyyd wants to merge 2 commits into from
Closed

tls: set tlsSocket.servername as early as possible #27759

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb8898
tls: set tlsSocket.servername as early as possible
oyyd May 17, 2019
44f2e3d
fixup! tls: set tlsSocket.servername as early as possible
oyyd May 19, 2019
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
Prev Previous commit
fixup! tls: set tlsSocket.servername as early as possible
  • Loading branch information
@oyyd
oyyd committed May 19, 2019
commit 44f2e3d75a42a305d3b93f2afccd1ad928630a51
6 changes: 4 additions & 2 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,8 +774,10 @@ TLSSocket.prototype._finishInit = function() {
return;

this.alpnProtocol = this._handle.getALPNNegotiatedProtocol();
// The servername could be set by TLSWrap.
this.servername = this._handle.getServername();
// The servername could be set by TLSWrap::SelectSNIContextCallback().
if (this.servername === null) {
this.servername = this._handle.getServername();
}

debug('%s _finishInit',
this._tlsOptions.isServer ? 'server' : 'client',
Expand Down
7 changes: 5 additions & 2 deletions src/tls_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,8 +1035,11 @@ int TLSWrap::SelectSNIContextCallback(SSL* s, int* ad, void* arg) {

// Set the servername as early as possible
Local<Object> owner = p->GetOwner();
USE(owner->Set(env->context(), env->servername_string(),
OneByteString(env->isolate(), servername)));
if (!owner->Set(env->context(),
env->servername_string(),
OneByteString(env->isolate(), servername)).FromMaybe(false)) {
return SSL_TLSEXT_ERR_NOACK;
}

if (!object->Get(env->context(), env->sni_context_string()).ToLocal(&ctx))
return SSL_TLSEXT_ERR_NOACK;
Expand Down