grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2956 from murgatroid99/grpc-js_sni_fix 

grpc-js: Fix ability to set SNI with ssl_target_name_override option
This commit is contained in:
Michael Lumish 2025-05-21 10:13:07 -07:00 committed by GitHub
parent 863a81a68e a1aff9d1bc
commit 7729fb7d89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@grpc/grpc-js", "name": "@grpc/grpc-js",
"version": "1.13.3", "version": "1.13.4",
"description": "gRPC Library for Node - pure JS implementation", "description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js", "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

39
packages/grpc-js/src/channel-credentials.ts
View File

@ -206,6 +206,18 @@ function getConnectionOptions(secureContext: SecureContext, verifyOptions: Verif
const connectionOptions: ConnectionOptions = { const connectionOptions: ConnectionOptions = {
secureContext: secureContext secureContext: secureContext
}; };
let realTarget: GrpcUri = channelTarget;
if ('grpc.http_connect_target' in options) {
const parsedTarget = parseUri(options['grpc.http_connect_target']!);
if (parsedTarget) {
realTarget = parsedTarget;
}
}
const targetPath = getDefaultAuthority(realTarget);
const hostPort = splitHostPort(targetPath);
const remoteHost = hostPort?.host ?? targetPath;
connectionOptions.host = remoteHost;
if (verifyOptions.checkServerIdentity) { if (verifyOptions.checkServerIdentity) {
connectionOptions.checkServerIdentity = verifyOptions.checkServerIdentity; connectionOptions.checkServerIdentity = verifyOptions.checkServerIdentity;
} }
@ -225,36 +237,11 @@ function getConnectionOptions(secureContext: SecureContext, verifyOptions: Verif
}; };
connectionOptions.servername = sslTargetNameOverride; connectionOptions.servername = sslTargetNameOverride;
} else { } else {
if ('grpc.http_connect_target' in options) { connectionOptions.servername = remoteHost;
/* This is more or less how servername will be set in createSession
* if a connection is successfully established through the proxy.
* If the proxy is not used, these connectionOptions are discarded
* anyway */
const targetPath = getDefaultAuthority(
parseUri(options['grpc.http_connect_target'] as string) ?? {
path: 'localhost',
}
);
const hostPort = splitHostPort(targetPath);
connectionOptions.servername = hostPort?.host ?? targetPath;
}
} }
if (options['grpc-node.tls_enable_trace']) { if (options['grpc-node.tls_enable_trace']) {
connectionOptions.enableTrace = true; connectionOptions.enableTrace = true;
} }
let realTarget: GrpcUri = channelTarget;
if ('grpc.http_connect_target' in options) {
const parsedTarget = parseUri(options['grpc.http_connect_target']!);
if (parsedTarget) {
realTarget = parsedTarget;
}
}
const targetPath = getDefaultAuthority(realTarget);
const hostPort = splitHostPort(targetPath);
const remoteHost = hostPort?.host ?? targetPath;
connectionOptions.host = remoteHost;
connectionOptions.servername = remoteHost;
return connectionOptions; return connectionOptions;
} }