From 22eb535eeee47554fdf2dceab7b2ec3aa562fc57 Mon Sep 17 00:00:00 2001 From: jonmv Date: Wed, 13 Dec 2023 15:19:23 +0100 Subject: Restore mixed mode for client --- .../src/main/java/org/apache/zookeeper/common/ClientX509Util.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'zookeeper-client-common') diff --git a/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java b/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java index 9eda60ea361..93053435e13 100644 --- a/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java +++ b/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java @@ -18,6 +18,8 @@ package org.apache.zookeeper.common; +import com.yahoo.security.tls.MixedMode; +import com.yahoo.security.tls.TransportSecurityUtils; import com.yahoo.vespa.zookeeper.VespaZookeeperTlsContextUtils; import io.netty.handler.ssl.DelegatingSslContext; import io.netty.handler.ssl.SslContext; @@ -70,7 +72,8 @@ public class ClientX509Util extends X509Util { SslContextBuilder sslContextBuilder = SslContextBuilder.forClient(); KeyManager km; TrustManager tm; - if (VespaZookeeperTlsContextUtils.tlsContext().isPresent()) { + if ( TransportSecurityUtils.getInsecureMixedMode() != MixedMode.PLAINTEXT_CLIENT_MIXED_SERVER + && VespaZookeeperTlsContextUtils.tlsContext().isPresent()) { km = VespaZookeeperTlsContextUtils.tlsContext().get().sslContext().keyManager(); tm = VespaZookeeperTlsContextUtils.tlsContext().get().sslContext().trustManager(); } -- cgit v1.2.3