From 334fa2c8eb9f3e0da2d5e86827e159d4b2abccaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20G=C3=A1l?= Date: Fri, 12 May 2023 14:33:42 +0200 Subject: [PATCH 1/2] HDDS-8587 Test multiple root CA certificates --- .../client/TestDefaultCertificateClient.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java index e5a09530cffb..d88b6da57852 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java @@ -39,6 +39,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; @@ -336,6 +338,25 @@ public void testStoreCertificate() throws Exception { .toString())); } + @Test + public void testStoreMultipleRootCACertificate() throws Exception { + KeyPair keyPair = keyGenerator.generateKey(); + X509Certificate cert1 = generateX509Cert(keyPair); + X509Certificate cert2 = generateX509Cert(keyPair); + X509Certificate cert3 = generateX509Cert(keyPair); + + dnCertClient.storeCertificate(getPEMEncodedString(cert1), CAType.ROOT); + dnCertClient.storeCertificate(getPEMEncodedString(cert2), CAType.ROOT); + dnCertClient.storeCertificate(getPEMEncodedString(cert3), CAType.ROOT); + + assertEquals(cert1, dnCertClient.getCertificate(cert1.getSerialNumber() + .toString())); + assertEquals(cert2, dnCertClient.getCertificate(cert2.getSerialNumber() + .toString())); + assertEquals(cert3, dnCertClient.getCertificate(cert3.getSerialNumber() + .toString())); + } + @Test public void testInitCertAndKeypairValidationFailures() throws Exception { GenericTestUtils.LogCapturer dnClientLog = GenericTestUtils.LogCapturer From 174d90f71a7edd699cafb7b331cfa0ec4b3312b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20G=C3=A1l?= Date: Mon, 15 May 2023 09:49:48 +0200 Subject: [PATCH 2/2] HDDS-8587 Remove unused imports --- .../x509/certificate/client/TestDefaultCertificateClient.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java index d88b6da57852..5049d2d59e12 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java @@ -39,8 +39,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.security.KeyPair; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature;