diff options
author | jonmv <venstad@gmail.com> | 2023-12-15 10:39:57 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-15 10:39:57 +0100 |
commit | 01b40d7e149df23c84a7a13560208e862480ce3a (patch) | |
tree | 38fbe525516be447347fded3d437854098086a5c /zookeeper-common/src | |
parent | 9c8ba2608384ee79e143babd1e5a18a62166541f (diff) |
Revert "Merge pull request #29669 from vespa-engine/revert-29662-revert-29661-revert-29658-jonmv/zk-3.9.1-clients-2"
This reverts commit 9c8ba2608384ee79e143babd1e5a18a62166541f, reversing
changes made to 954785e4eb91286bd166c304e98042ec63b7eb84.
Diffstat (limited to 'zookeeper-common/src')
-rw-r--r-- | zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java b/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java new file mode 100644 index 00000000000..78de6c61e17 --- /dev/null +++ b/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java @@ -0,0 +1,26 @@ +package com.yahoo.vespa.zookeeper.tls; + +import com.yahoo.security.tls.ConfigFileBasedTlsContext; +import com.yahoo.security.tls.TlsContext; +import com.yahoo.security.tls.TransportSecurityUtils; +import com.yahoo.vespa.defaults.Defaults; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Optional; + +/** + * @author jonmv + */ +public class VespaZookeeperTlsContextUtils { + + private static final Path ZOOKEEPER_TLS_CONFIG_FILE = Path.of(Defaults.getDefaults().underVespaHome("var/zookeeper/conf/tls.conf.json")); + private static final TlsContext tlsContext = Files.exists(ZOOKEEPER_TLS_CONFIG_FILE) + ? new ConfigFileBasedTlsContext(ZOOKEEPER_TLS_CONFIG_FILE, TransportSecurityUtils.getInsecureAuthorizationMode()) + : TransportSecurityUtils.getSystemTlsContext().orElse(null); + + public static Optional<TlsContext> tlsContext() { + return Optional.ofNullable(tlsContext); + } + +} |