From 989164784ea71c3358fd75a5966dbd0185fd662e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 17 Mar 2021 15:48:06 +0100 Subject: Set auth provider as system propertuy and use x509 as scheme Using config does not work, need to use system property --- .../src/main/java/com/yahoo/vespa/zookeeper/Configurator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'zookeeper-server/zookeeper-server-common/src') diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 0cb495fef2a..749f713b29e 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -34,6 +34,8 @@ public class Configurator { System.setProperty(ZOOKEEPER_JMX_LOG4J_DISABLE, "true"); System.setProperty("zookeeper.snapshot.trust.empty", Boolean.valueOf(zookeeperServerConfig.trustEmptySnapshot()).toString()); System.setProperty(ZOOKEEPER_JUTE_MAX_BUFFER, Integer.valueOf(zookeeperServerConfig.juteMaxBuffer()).toString()); + // Need to set this as a system property instead of config, config does not work + System.setProperty("zookeeper.authProvider.x509", "com.yahoo.vespa.zookeeper.VespaMtlsAuthenticationProvider"); } void writeConfigToDisk(Optional tlsContext) { @@ -195,9 +197,6 @@ public class Configurator { sb.append("client.portUnification=").append(portUnification).append("\n") .append("clientPort=").append(secureClientPort ? 0 : config.clientPort()).append("\n") .append("secureClientPort=").append(secureClientPort ? config.clientPort() : 0).append("\n"); - tlsContext.ifPresent(ignored -> - sb.append("ssl.authProvider.vespaMtls=com.yahoo.vespa.zookeeper.VespaMtlsAuthenticationProvider\n") - .append("ssl.authProvider=vespaMtls\n")); appendSharedTlsConfig(sb, tlsContext); return sb.toString(); -- cgit v1.2.3