diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-20 12:19:10 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-20 12:31:16 +0200 |
commit | a3061cc16535aaa1c1967fce61400b1926ff5e47 (patch) | |
tree | dc673295c566cdf8d0c804c30af10bf1784c61e6 /vespa-athenz | |
parent | e590767e3bb6346b1edf65f3a2e0e66c33608a77 (diff) |
Rename AthenzSslContextBuilder -> SslContextBuilder
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java | 4 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java | 4 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java (renamed from vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilder.java) | 18 | ||||
-rw-r--r-- | vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/SslContextBuilderTest.java (renamed from vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilderTest.java) | 14 |
4 files changed, 20 insertions, 20 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 0048da4d441..b79b5850f3c 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 @@ -6,7 +6,7 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; import com.yahoo.vespa.athenz.api.AthenzIdentityCertificate; import com.yahoo.vespa.athenz.api.AthenzService; -import com.yahoo.vespa.athenz.tls.AthenzSslContextBuilder; +import com.yahoo.vespa.athenz.tls.SslContextBuilder; import com.yahoo.vespa.athenz.tls.KeyStoreType; import com.yahoo.vespa.athenz.tls.KeyUtils; import com.yahoo.vespa.athenz.tls.X509CertificateUtils; @@ -84,7 +84,7 @@ public class SiaIdentityProvider extends AbstractComponent implements AthenzIden X509Certificate certificate = X509CertificateUtils.fromPem(certPem); String keyPem = new String(Files.readAllBytes(privateKeyFile.toPath())); PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(keyPem); - return new AthenzSslContextBuilder() + return new SslContextBuilder() .withTrustStore(trustStoreFile, KeyStoreType.JKS) .withIdentityCertificate(new AthenzIdentityCertificate(certificate, privateKey)) .build(); 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 dae2889ee5f..e2b35c2f47c 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 @@ -9,7 +9,7 @@ import com.yahoo.container.jdisc.athenz.AthenzIdentityProviderException; import com.yahoo.jdisc.Metric; import com.yahoo.log.LogLevel; import com.yahoo.vespa.athenz.api.AthenzIdentityCertificate; -import com.yahoo.vespa.athenz.tls.AthenzSslContextBuilder; +import com.yahoo.vespa.athenz.tls.SslContextBuilder; import com.yahoo.vespa.defaults.Defaults; import javax.net.ssl.SSLContext; @@ -96,7 +96,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen @Override public SSLContext getIdentitySslContext() { - return new AthenzSslContextBuilder() + return new SslContextBuilder() .withIdentityCertificate(new AthenzIdentityCertificate( credentials.getCertificate(), credentials.getKeyPair().getPrivate())) diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java index 57fc7d1b581..def45849fd8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java @@ -19,42 +19,42 @@ import java.security.cert.X509Certificate; /** * @author bjorncs */ -public class AthenzSslContextBuilder { +public class SslContextBuilder { private KeyStoreSupplier trustStoreSupplier; private KeyStoreSupplier keyStoreSupplier; private char[] keyStorePassword; - public AthenzSslContextBuilder() {} + public SslContextBuilder() {} - public AthenzSslContextBuilder withTrustStore(File file, KeyStoreType trustStoreType) { + public SslContextBuilder withTrustStore(File file, KeyStoreType trustStoreType) { this.trustStoreSupplier = () -> KeyStoreBuilder.withType(trustStoreType).fromFile(file).build(); return this; } - public AthenzSslContextBuilder withTrustStore(KeyStore trustStore) { + public SslContextBuilder withTrustStore(KeyStore trustStore) { this.trustStoreSupplier = () -> trustStore; return this; } - public AthenzSslContextBuilder withIdentityCertificate(AthenzIdentityCertificate certificate) { + public SslContextBuilder withIdentityCertificate(AthenzIdentityCertificate certificate) { return withKeyStore(certificate.getPrivateKey(), certificate.getCertificate()); } - public AthenzSslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate certificate) { + public SslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate certificate) { char[] pwd = new char[0]; - this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("athenz", privateKey, certificate).build(); + this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificate).build(); this.keyStorePassword = pwd; return this; } - public AthenzSslContextBuilder withKeyStore(KeyStore keyStore, char[] password) { + public SslContextBuilder withKeyStore(KeyStore keyStore, char[] password) { this.keyStoreSupplier = () -> keyStore; this.keyStorePassword = password; return this; } - public AthenzSslContextBuilder withKeyStore(File file, char[] password, KeyStoreType keyStoreType) { + public SslContextBuilder withKeyStore(File file, char[] password, KeyStoreType keyStoreType) { this.keyStoreSupplier = () -> KeyStoreBuilder.withType(keyStoreType).fromFile(file, password).build(); this.keyStorePassword = password; return this; diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilderTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/SslContextBuilderTest.java index cf1b2168dc8..2f750d915d4 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/AthenzSslContextBuilderTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/SslContextBuilderTest.java @@ -16,7 +16,7 @@ import static com.yahoo.vespa.athenz.tls.TestUtils.createKeystoreFile; /** * @author bjorncs */ -public class AthenzSslContextBuilderTest { +public class SslContextBuilderTest { private static final char[] PASSWORD = new char[0]; @@ -25,21 +25,21 @@ public class AthenzSslContextBuilderTest { @Test public void can_build_sslcontext_with_truststore_only() throws Exception { - new AthenzSslContextBuilder() + new SslContextBuilder() .withTrustStore(createKeystore(KeyStoreType.JKS, PASSWORD)) .build(); } @Test public void can_build_sslcontext_with_keystore_only() throws Exception { - new AthenzSslContextBuilder() + new SslContextBuilder() .withKeyStore(createKeystore(KeyStoreType.JKS, PASSWORD), PASSWORD) .build(); } @Test public void can_build_sslcontext_with_truststore_and_keystore() throws Exception { - new AthenzSslContextBuilder() + new SslContextBuilder() .withKeyStore(createKeystore(KeyStoreType.JKS, PASSWORD), PASSWORD) .withTrustStore(createKeystore(KeyStoreType.JKS, PASSWORD)) .build(); @@ -49,7 +49,7 @@ public class AthenzSslContextBuilderTest { public void can_build_sslcontext_with_keystore_from_private_key_and_certificate() throws Exception { KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA, 2048); X509Certificate certificate = createCertificate(keyPair); - new AthenzSslContextBuilder() + new SslContextBuilder() .withKeyStore(keyPair.getPrivate(), certificate) .build(); } @@ -59,7 +59,7 @@ public class AthenzSslContextBuilderTest { File keystoreFile = tempDirectory.newFile(); createKeystoreFile(keystoreFile, KeyStoreType.JKS, PASSWORD); - new AthenzSslContextBuilder() + new SslContextBuilder() .withKeyStore(keystoreFile, PASSWORD, KeyStoreType.JKS) .build(); } @@ -69,7 +69,7 @@ public class AthenzSslContextBuilderTest { File keystoreFile = tempDirectory.newFile(); createKeystoreFile(keystoreFile, KeyStoreType.PKCS12, PASSWORD); - new AthenzSslContextBuilder() + new SslContextBuilder() .withKeyStore(keystoreFile, PASSWORD, KeyStoreType.PKCS12) .build(); } |