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

Add error on DNS parsing failure, fix proxy DNS name

This commit is contained in:
Michael Lumish 2020-04-14 11:32:07 -07:00
parent cba41bc487
commit e73c96298f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/src/http_proxy.ts
View File

@ -145,7 +145,7 @@ export function mapProxyName(
extraOptions['grpc.http_connect_creds'] = proxyInfo.creds; extraOptions['grpc.http_connect_creds'] = proxyInfo.creds;
} }
return { return {
target: `dns:///${proxyInfo.address}`, target: `dns:${proxyInfo.address}`,
extraOptions: extraOptions, extraOptions: extraOptions,
}; };
} }

10
packages/grpc-js/src/resolver-dns.ts
View File

@ -171,7 +171,15 @@ class DnsResolver implements Resolver {
}); });
return; return;
} }
if (this.dnsHostname !== null) { if (this.dnsHostname === null) {
setImmediate(() => {
this.listener.onError({
code: Status.UNAVAILABLE,
details: `Failed to parse DNS address ${this.target}`,
metadata: new Metadata(),
});
});
} else {
/* We clear out latestLookupResult here to ensure that it contains the /* We clear out latestLookupResult here to ensure that it contains the
* latest result since the last time we started resolving. That way, the * latest result since the last time we started resolving. That way, the
* TXT resolution handler can use it, but only if it finishes second. We * TXT resolution handler can use it, but only if it finishes second. We