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

Fixed connectivity to Google PubSub over proxy #1555

Merged
merged 7 commits into from Aug 31, 2020
Merged

Fixed connectivity to Google PubSub over proxy #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c536178
Fixed connectivity to Google PubSub over proxy
wkchee Aug 29, 2020
6f3db6f
Update http_proxy.ts
wkchee Aug 30, 2020
08350ec
Update subchannel.ts
wkchee Aug 30, 2020
6a99983
Undo changes.
wkchee Aug 30, 2020
148b273
Update http_proxy.ts
wkchee Aug 31, 2020
7fc0035
Update subchannel.ts
wkchee Aug 31, 2020
158d0dd
Update subchannel.ts
wkchee Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/grpc-js/src/http_proxy.ts
View file
Open in desktop
Expand Up @@ -215,8 +215,10 @@ export function getProxiedConnection(
* connection to a TLS connection.
* This is a workaround for https://github.com/nodejs/node/issues/32922
* See https://github.com/grpc/grpc-node/pull/1369 for more info. */
const remoteHost = getDefaultAuthority(parsedTarget);

const targetPath = getDefaultAuthority(parsedTarget);
const hostPort = splitHostPort(targetPath);
const remoteHost = hostPort?.host ?? targetPath;

const cts = tls.connect(
{
host: remoteHost,
Expand Down
4 changes: 3 additions & 1 deletion packages/grpc-js/src/subchannel.ts
View file
Open in desktop
Expand Up @@ -467,11 +467,13 @@ export class Subchannel {
* if a connection is successfully established through the proxy.
* If the proxy is not used, these connectionOptions are discarded
* anyway */
connectionOptions.servername = getDefaultAuthority(
const targetPath = getDefaultAuthority(
parseUri(this.options['grpc.http_connect_target'] as string) ?? {
path: 'localhost',
}
);
const hostPort = splitHostPort(targetPath);
connectionOptions.servername = hostPort?.host ?? targetPath;
}
}
}
Expand Down