mirror of https://github.com/grpc/grpc-node.git
grpc-js: Fix TLS server name handling
This commit is contained in:
parent
75713b5457
commit
4fb254ddb6
|
@ -329,9 +329,11 @@ export class Http2CallStream extends Duplex implements Call {
|
|||
switch (stream.rstCode) {
|
||||
case http2.constants.NGHTTP2_REFUSED_STREAM:
|
||||
code = Status.UNAVAILABLE;
|
||||
details = 'Stream refused by server';
|
||||
break;
|
||||
case http2.constants.NGHTTP2_CANCEL:
|
||||
code = Status.CANCELLED;
|
||||
details = 'Call cancelled';
|
||||
break;
|
||||
case http2.constants.NGHTTP2_ENHANCE_YOUR_CALM:
|
||||
code = Status.RESOURCE_EXHAUSTED;
|
||||
|
|
|
@ -23,6 +23,7 @@ import { ChannelOptions } from './channel-options';
|
|||
import { PeerCertificate, checkServerIdentity } from 'tls';
|
||||
import { ConnectivityState } from './channel';
|
||||
import { BackoffTimeout } from './backoff-timeout';
|
||||
import { getDefaultAuthority } from './resolver';
|
||||
|
||||
const { version: clientVersion } = require('../../package.json');
|
||||
|
||||
|
@ -230,7 +231,7 @@ export class Subchannel {
|
|||
};
|
||||
connectionOptions.servername = sslTargetNameOverride;
|
||||
} else {
|
||||
connectionOptions.servername = this.channelTarget;
|
||||
connectionOptions.servername = getDefaultAuthority(this.channelTarget);
|
||||
}
|
||||
}
|
||||
this.session = http2.connect(
|
||||
|
|
|
@ -121,5 +121,37 @@ describe('Name Resolver', () => {
|
|||
const resolver = resolverManager.createResolver(target, listener);
|
||||
resolver.updateResolution();
|
||||
});
|
||||
it('Should resolve gRPC interop servers', done => {
|
||||
let completeCount = 0;
|
||||
function done2(error?: Error) {
|
||||
if (error) {
|
||||
done(error);
|
||||
} else {
|
||||
completeCount += 1;
|
||||
if (completeCount === 2) {
|
||||
done();
|
||||
}
|
||||
}
|
||||
}
|
||||
const target1 = 'grpc-test.sandbox.googleapis.com';
|
||||
const target2 = 'grpc-test4.sandbox.googleapis.com';
|
||||
const listener: resolverManager.ResolverListener = {
|
||||
onSuccessfulResolution: (
|
||||
addressList: string[],
|
||||
serviceConfig: ServiceConfig | null,
|
||||
serviceConfigError: StatusObject | null
|
||||
) => {
|
||||
assert(addressList.length > 0);
|
||||
done2();
|
||||
},
|
||||
onError: (error: StatusObject) => {
|
||||
done2(new Error(`Failed with status ${error.details}`));
|
||||
},
|
||||
};
|
||||
const resolver1 = resolverManager.createResolver(target1, listener);
|
||||
resolver1.updateResolution();
|
||||
const resolver2 = resolverManager.createResolver(target1, listener);
|
||||
resolver2.updateResolution();
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue