diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2022-10-12 11:18:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-12 11:18:46 +0200 |
commit | fa0fb518f84539d9c9bb530c2f90b783f66c736e (patch) | |
tree | c0418b6e0e7081ee90f740c15cc9458352d62c53 | |
parent | 1392e1638854131eb91412e31d52e71810be5e98 (diff) | |
parent | a1ff9c399263a1234e9f63d98be3f08400e066c3 (diff) |
Merge pull request #24397 from vespa-engine/hakonhall/use-yahoo-cert-bundle-trust-store-when-uploading-to-panic-in-gcp
SIA identity SSLContext with custom trust store
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java index a032b23bfb3..0415bca1670 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java @@ -70,6 +70,10 @@ public class SiaIdentityProvider extends AbstractComponent implements ServiceIde @Override public Path certificatePath() { return certificateFile; } @Override public Path privateKeyPath() { return privateKeyFile; } + public SSLContext createIdentitySslContextWithTrustStore(Path trustStoreFile) { + return createIdentitySslContext(keyManager, trustStoreFile); + } + private static SSLContext createIdentitySslContext(AutoReloadingX509KeyManager keyManager, Path trustStoreFile) { return new SslContextBuilder() .withTrustStore(trustStoreFile) |