diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-12-14 18:56:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-14 18:56:52 +0100 |
commit | 21ce1b6512aecdf1f74dd1570840243cbff90ea8 (patch) | |
tree | 90c35a9a1daa6625e684d9f9061c6ff128f32cb0 /zookeeper-common/src | |
parent | 87bd46287bd1813d8096d907ff8bdcd8dadc82be (diff) |
Revert "Revert "Jonmv/zk 3.9.1 clients 2""
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); + } + +} |