diff options
4 files changed, 15 insertions, 1 deletions
diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json index 81de014c6ad..d3ad495ff71 100644 --- a/container-disc/abi-spec.json +++ b/container-disc/abi-spec.json @@ -17,7 +17,8 @@ "public abstract java.lang.String getAccessToken(java.lang.String)", "public abstract java.lang.String getAccessToken(java.lang.String, java.util.List)", "public abstract java.util.List getIdentityCertificate()", - "public abstract java.security.PrivateKey getPrivateKey()" + "public abstract java.security.PrivateKey getPrivateKey()", + "public abstract java.nio.file.Path trustStorePath()" ], "fields": [] }, diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java index bb862aeca82..0e3110e26a8 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java @@ -5,6 +5,7 @@ import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; import javax.net.ssl.SSLContext; +import java.nio.file.Path; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.List; @@ -77,5 +78,10 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr public PrivateKey getPrivateKey() { throw new UnsupportedOperationException(message); } + + @Override + public Path trustStorePath() { + throw new UnsupportedOperationException(message); + } } } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index 696aab85b0c..10bf96749e8 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -2,6 +2,7 @@ package com.yahoo.container.jdisc.athenz; import javax.net.ssl.SSLContext; +import java.nio.file.Path; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.List; @@ -20,4 +21,5 @@ public interface AthenzIdentityProvider { String getAccessToken(String domain, List<String> roles); List<X509Certificate> getIdentityCertificate(); PrivateKey getPrivateKey(); + Path trustStorePath(); } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java index 5d6f0e3ce16..144ffaea5b4 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java @@ -219,6 +219,11 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen } @Override + public Path trustStorePath() { + return trustStore; + } + + @Override public List<X509Certificate> getIdentityCertificate() { return Collections.singletonList(credentials.getCertificate()); } |