From 485d4235f75dad465fedf6dec546407ba5780faf Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 24 Nov 2023 09:20:26 +0100 Subject: Handle non-vespa-mtls scenario during setup of providers --- .../com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'zookeeper-server/zookeeper-server-3.8.1') diff --git a/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java b/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java index 8bb88a83b10..68f7459530e 100644 --- a/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java +++ b/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.security.X509SslContext; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.data.Id; import org.apache.zookeeper.server.ServerCnxn; @@ -26,11 +27,11 @@ public class VespaMtlsAuthenticationProvider extends X509AuthenticationProvider } private static X509KeyManager keyManager() { - return new VespaSslContextProvider().tlsContext().keyManager(); + return new VespaSslContextProvider().tlsContext().map(X509SslContext::keyManager).orElse(null); } private static X509TrustManager trustManager() { - return new VespaSslContextProvider().tlsContext().trustManager(); + return new VespaSslContextProvider().tlsContext().map(X509SslContext::trustManager).orElse(null); } @Override -- cgit v1.2.3