2121import com .google .common .annotations .VisibleForTesting ;
2222import com .google .common .base .Optional ;
2323import com .google .common .base .Preconditions ;
24- import com .google .common .base .Strings ;
2524import com .google .errorprone .annotations .ForOverride ;
2625import io .grpc .Attributes ;
2726import io .grpc .CallCredentials ;
@@ -583,7 +582,7 @@ public ClientTlsProtocolNegotiator(SslContext sslContext,
583582 ObjectPool <? extends Executor > executorPool ,
584583 Optional <Runnable > handshakeCompleteRunnable ,
585584 X509TrustManager x509ExtendedTrustManager ,
586- String sni ) {
585+ String sni , boolean isXdsTarget ) {
587586 this .sslContext = Preconditions .checkNotNull (sslContext , "sslContext" );
588587 this .executorPool = executorPool ;
589588 if (this .executorPool != null ) {
@@ -592,13 +591,15 @@ public ClientTlsProtocolNegotiator(SslContext sslContext,
592591 this .handshakeCompleteRunnable = handshakeCompleteRunnable ;
593592 this .x509ExtendedTrustManager = x509ExtendedTrustManager ;
594593 this .sni = sni ;
594+ this .isXdsTarget = isXdsTarget ;
595595 }
596596
597597 private final SslContext sslContext ;
598598 private final ObjectPool <? extends Executor > executorPool ;
599599 private final Optional <Runnable > handshakeCompleteRunnable ;
600600 private final X509TrustManager x509ExtendedTrustManager ;
601601 private final String sni ;
602+ private final boolean isXdsTarget ;
602603 private Executor executor ;
603604
604605 @ Override
@@ -611,7 +612,7 @@ public ChannelHandler newHandler(GrpcHttp2ConnectionHandler grpcHandler) {
611612 ChannelHandler gnh = new GrpcNegotiationHandler (grpcHandler );
612613 ChannelLogger negotiationLogger = grpcHandler .getNegotiationLogger ();
613614 ChannelHandler cth = new ClientTlsHandler (gnh , sslContext ,
614- ! Strings . isNullOrEmpty ( sni ) ? sni : grpcHandler .getAuthority (),
615+ isXdsTarget ? sni : grpcHandler .getAuthority (),
615616 this .executor , negotiationLogger , handshakeCompleteRunnable , null ,
616617 x509ExtendedTrustManager );
617618 return new WaitUntilActiveHandler (cth , negotiationLogger );
@@ -753,13 +754,14 @@ static HostPort parseAuthority(String authority) {
753754 * Returns a {@link ProtocolNegotiator} that ensures the pipeline is set up so that TLS will
754755 * be negotiated, the {@code handler} is added and writes to the {@link io.netty.channel.Channel}
755756 * may happen immediately, even before the TLS Handshake is complete.
757+ *
756758 * @param executorPool a dedicated {@link Executor} pool for time-consuming TLS tasks
757759 */
758760 public static ProtocolNegotiator tls (SslContext sslContext ,
759- ObjectPool <? extends Executor > executorPool , Optional <Runnable > handshakeCompleteRunnable ,
760- X509TrustManager x509ExtendedTrustManager , String sni ) {
761+ ObjectPool <? extends Executor > executorPool , Optional <Runnable > handshakeCompleteRunnable ,
762+ X509TrustManager x509ExtendedTrustManager , String sni , boolean isXdsTarget ) {
761763 return new ClientTlsProtocolNegotiator (sslContext , executorPool , handshakeCompleteRunnable ,
762- x509ExtendedTrustManager , sni );
764+ x509ExtendedTrustManager , sni , isXdsTarget );
763765 }
764766
765767 /**
@@ -769,7 +771,7 @@ public static ProtocolNegotiator tls(SslContext sslContext,
769771 */
770772 public static ProtocolNegotiator tls (SslContext sslContext ,
771773 X509TrustManager x509ExtendedTrustManager ) {
772- return tls (sslContext , null , Optional .absent (), x509ExtendedTrustManager , null );
774+ return tls (sslContext , null , Optional .absent (), x509ExtendedTrustManager , null , false );
773775 }
774776
775777 public static ProtocolNegotiator .ClientFactory tlsClientFactory (SslContext sslContext ,
0 commit comments