diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-05-28 18:31:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-28 18:31:38 +0200 |
commit | ab6c2c71d7d98120b09345b8e2cc59ec8374bb89 (patch) | |
tree | 78f5fcf60e8ce01af7c04b2b9b334ca0da4dbffb /vespa-athenz/src/test | |
parent | fd776f01675f8e86a03e07e98fd84cf5ba5f4372 (diff) |
Revert "Expose underlying certificate and private key from SiaIdentityProvider "
Diffstat (limited to 'vespa-athenz/src/test')
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java index b7db502b1d0..ce02860cc78 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java @@ -2,11 +2,15 @@ package com.yahoo.vespa.athenz.identity; import com.yahoo.security.KeyAlgorithm; +import com.yahoo.security.KeyStoreBuilder; +import com.yahoo.security.KeyStoreType; +import com.yahoo.security.KeyStoreUtils; import com.yahoo.security.KeyUtils; import com.yahoo.security.SignatureAlgorithm; import com.yahoo.security.X509CertificateBuilder; import com.yahoo.security.X509CertificateUtils; import com.yahoo.vespa.athenz.api.AthenzService; +import com.yahoo.yolean.Exceptions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -17,11 +21,11 @@ import java.io.IOException; import java.math.BigInteger; import java.nio.file.Files; import java.security.KeyPair; +import java.security.KeyStore; import java.security.cert.X509Certificate; import java.time.Duration; import java.time.Instant; -import static com.yahoo.yolean.Exceptions.uncheck; import static org.junit.Assert.assertNotNull; /** @@ -48,10 +52,10 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile.toPath(), - certificateFile.toPath(), - trustStoreFile.toPath(), - trustStoreFile.toPath()); + keyFile, + certificateFile, + trustStoreFile, + SiaProviderConfig.TrustStoreType.Enum.jks); assertNotNull(provider.getIdentitySslContext()); } @@ -72,10 +76,10 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile.toPath(), - certificateFile.toPath(), - trustStoreFile.toPath(), - trustStoreFile.toPath()); + keyFile, + certificateFile, + trustStoreFile, + SiaProviderConfig.TrustStoreType.Enum.pem); assertNotNull(provider.getIdentitySslContext()); } @@ -105,11 +109,14 @@ public class SiaIdentityProviderTest { private void createPemTrustStoreFile(X509Certificate certificate, File trustStoreFile) { var pemEncoded = X509CertificateUtils.toPem(certificate); - uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded)); + Exceptions.uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded)); } private void createTrustStoreFile(X509Certificate certificate, File trustStoreFile) { - uncheck(() -> Files.writeString(trustStoreFile.toPath(), X509CertificateUtils.toPem(certificate))); + KeyStore keystore = KeyStoreBuilder.withType(KeyStoreType.JKS) + .withCertificateEntry("dummy-cert", certificate) + .build(); + KeyStoreUtils.writeKeyStoreToFile(keystore, trustStoreFile.toPath()); } } |