summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-04-14 08:46:33 +0200
committerMorten Tokle <mortent@verizonmedia.com>2020-04-14 09:10:13 +0200
commit8cbfe939b0b70e4a88ff58aa80bf62a428be5993 (patch)
tree0938eeea824619e5b776b9f1e11ef17ca77b0548 /container-disc
parentc7f2e56fdb745c2c0c61e2f59f9c45ee873531be (diff)
Expose truststore path
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/abi-spec.json3
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java6
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java2
3 files changed, 10 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();
}