diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2020-06-02 13:56:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-02 13:56:52 +0200 |
commit | 7bee3afd465559d2fe0b4994d10c14660bdbad3f (patch) | |
tree | 3e65171c5e0f5c1b113ed4dbf0a168101b54b5c6 /vespa-athenz/src/test/java/com | |
parent | 83f00b2337fa9d2c280f407590ac703401dabf79 (diff) |
Revert "Revert "Expose underlying certificate and private key from SiaIdentityProvider ""
Diffstat (limited to 'vespa-athenz/src/test/java/com')
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identity/SiaIdentityProviderTest.java | 29 |
1 files changed, 11 insertions, 18 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 ce02860cc78..b7db502b1d0 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,15 +2,11 @@ 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; @@ -21,11 +17,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; /** @@ -52,10 +48,10 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile, - certificateFile, - trustStoreFile, - SiaProviderConfig.TrustStoreType.Enum.jks); + keyFile.toPath(), + certificateFile.toPath(), + trustStoreFile.toPath(), + trustStoreFile.toPath()); assertNotNull(provider.getIdentitySslContext()); } @@ -76,10 +72,10 @@ public class SiaIdentityProviderTest { SiaIdentityProvider provider = new SiaIdentityProvider( new AthenzService("domain", "service-name"), - keyFile, - certificateFile, - trustStoreFile, - SiaProviderConfig.TrustStoreType.Enum.pem); + keyFile.toPath(), + certificateFile.toPath(), + trustStoreFile.toPath(), + trustStoreFile.toPath()); assertNotNull(provider.getIdentitySslContext()); } @@ -109,14 +105,11 @@ public class SiaIdentityProviderTest { private void createPemTrustStoreFile(X509Certificate certificate, File trustStoreFile) { var pemEncoded = X509CertificateUtils.toPem(certificate); - Exceptions.uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded)); + uncheck(() -> Files.writeString(trustStoreFile.toPath(), pemEncoded)); } private void createTrustStoreFile(X509Certificate certificate, File trustStoreFile) { - KeyStore keystore = KeyStoreBuilder.withType(KeyStoreType.JKS) - .withCertificateEntry("dummy-cert", certificate) - .build(); - KeyStoreUtils.writeKeyStoreToFile(keystore, trustStoreFile.toPath()); + uncheck(() -> Files.writeString(trustStoreFile.toPath(), X509CertificateUtils.toPem(certificate))); } } |