diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-05-15 10:55:24 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-05-18 13:26:56 +0200 |
| commit | 480d205734db359a707c75768facf1aabea5acf4 (patch) | |
| tree | c61e1be057516f0f36a5c07023ae56e0e11bccb4 /vespa-athenz | |
| parent | cf8af6d6ce0be3dd565b1f7a14f0648d482b3e42 (diff) | |
Implement new certificate/privateKeyPath in AthenzIdentityProviderImpl
Diffstat (limited to 'vespa-athenz')
2 files changed, 6 insertions, 3 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java index 3b733e05708..8e029906c30 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java @@ -64,6 +64,9 @@ class AthenzCredentialsService { this.clock = clock; } + Path certificatePath() { return SiaUtils.getCertificateFile(VESPA_SIA_DIRECTORY, tenantIdentity); } + Path privateKeyPath() { return SiaUtils.getPrivateKeyFile(VESPA_SIA_DIRECTORY, tenantIdentity); } + AthenzCredentials registerInstance() { Optional<AthenzCredentials> athenzCredentialsFromDisk = tryReadCredentialsFromDisk(); if (athenzCredentialsFromDisk.isPresent()) { 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 a52ad159fdc..cc6061cb172 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 @@ -184,9 +184,9 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen return new X509CertificateWithKey(copy.getCertificate(), copy.getKeyPair().getPrivate()); } - // The files should ideally not be used directly, must be implemented later if necessary - @Override public Path certificatePath() { throw new UnsupportedOperationException(); } - @Override public Path privateKeyPath() { throw new UnsupportedOperationException(); } + @Override public Path certificatePath() { return athenzCredentialsService.certificatePath(); } + + @Override public Path privateKeyPath() { return athenzCredentialsService.privateKeyPath(); } @Override public SSLContext getRoleSslContext(String domain, String role) { |