diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-17 15:48:06 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-03-17 15:48:06 +0100 |
commit | 989164784ea71c3358fd75a5966dbd0185fd662e (patch) | |
tree | 83b60ebe9e6db7746d510e48878cf9567d795546 /zookeeper-server | |
parent | 1b4fc45511c3c7856024d5228b8a9189553e5ded (diff) |
Set auth provider as system propertuy and use x509 as scheme
Using config does not work, need to use system property
Diffstat (limited to 'zookeeper-server')
2 files changed, 3 insertions, 4 deletions
diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java index d72e36ba909..7a0efbb6c24 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java @@ -36,6 +36,6 @@ public class VespaMtlsAuthenticationProvider extends X509AuthenticationProvider return KeeperException.Code.OK; } - @Override public String getScheme() { return "vespaMtls"; } + @Override public String getScheme() { return "x509"; } } 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> 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(); |