diff options
author | jonmv <venstad@gmail.com> | 2023-12-15 17:04:22 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-15 17:04:22 +0100 |
commit | 9cf9e62f0d97a0530936c829062320859d3db06c (patch) | |
tree | eb1fad9d94f1494eb065cd84985a277dd6d5c48c /zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java | |
parent | 28f8cf3e298d51ca703ceee36a992297d38637cc (diff) |
Revert "Merge pull request #29674 from vespa-engine/revert-29671-jonmv/reapply-zk-3.9.1"
This reverts commit 28f8cf3e298d51ca703ceee36a992297d38637cc, reversing
changes made to 3a9f89fe60e3420eed435daee435a4f8534c9512.
Diffstat (limited to 'zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java')
-rw-r--r-- | zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java index 9cc71eab96e..5772070d550 100644 --- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java +++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java @@ -1,25 +1,23 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper.client; -import com.yahoo.security.tls.TransportSecurityUtils; +import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils; import javax.net.ssl.SSLContext; import java.util.function.Supplier; /** - * Provider for Vespa {@link SSLContext} instance to Zookeeper + misc utility methods for providing Vespa TLS specific ZK configuration. + * Provider for Vespa {@link SSLContext} instance to Zookeeper. * * @author bjorncs */ public class VespaSslContextProvider implements Supplier<SSLContext> { - private static final SSLContext sslContext = TransportSecurityUtils.getSystemTlsContext() - .map(tc -> tc.sslContext().context()).orElse(null); - @Override public SSLContext get() { - if (sslContext == null) throw new IllegalStateException("Vespa TLS is not enabled"); - return sslContext; + return VespaZookeeperTlsContextUtils.tlsContext() + .orElseThrow(() -> new IllegalStateException("Vespa TLS is not enabled")) + .sslContext().context(); } } |