You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2026/10/17 18:37:08 UTC

(ozone) 10/12: HDDS-17030. DefaultApprover.inspectCSR never completes its future when the CSR passes inspection (#11544)

This is an automated email from the ASF dual-hosted git repository.

smengcl pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 7e28646425d767e35c1f9d4d0389f42351408ce3
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Fri Oct 16 16:53:40 2026 -0700

    HDDS-17030. DefaultApprover.inspectCSR never completes its future when the CSR passes inspection (#11544)
    
    Generated-by: Claude Opus 5.5 <no...@anthropic.com>
    (cherry picked from commit 9ad4b3f4c86e5dedcaa71c8dc3668376be83de41)
---
 .../certificate/authority/DefaultApprover.java     |  5 ++-
 .../certificate/authority/DefaultCAServer.java     |  5 +++
 .../certificate/authority/TestDefaultCAServer.java | 33 ++++++++++++++++
 .../certificate/authority/TestDefaultProfile.java  | 45 ++++++++++++++++++++++
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
index c568b950962..23d5c8f67f6 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
@@ -334,6 +334,7 @@ public CompletableFuture<Void> inspectCSR(PKCS10CertificationRequest csr) {
         LOG.error("Failed to verify the signature in CSR.");
         response.completeExceptionally(new SCMSecurityException("Failed to " +
             "verify the CSR."));
+        return response;
       }
 
       // Step 2: Verify the RDNs are in the correct format.
@@ -343,6 +344,7 @@ public CompletableFuture<Void> inspectCSR(PKCS10CertificationRequest csr) {
           LOG.error("Failed in verifying RDNs");
           response.completeExceptionally(new SCMSecurityException("Failed to " +
               "verify the RDNs. Please check the subject name."));
+          return response;
         }
       }
 
@@ -351,8 +353,9 @@ public CompletableFuture<Void> inspectCSR(PKCS10CertificationRequest csr) {
         LOG.error("failed in verification of extensions.");
         response.completeExceptionally(new SCMSecurityException("Failed to " +
             "verify extensions."));
+        return response;
       }
-
+      response.complete(null);
     } catch (OperatorCreationException | PKCSException e) {
       LOG.error("Approval Failure.", e);
       response.completeExceptionally(new SCMSecurityException(e));
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
index 77845325dbd..75d19dedd2b 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
@@ -212,6 +212,11 @@ public Future<CertPath> requestCertificate(
 
     CompletableFuture<Void> csrInspection = approver.inspectCSR(csr);
     CompletableFuture<CertPath> certPathPromise = new CompletableFuture<>();
+    // An inspection that has not completed is not an approval.
+    if (!csrInspection.isDone()) {
+      certPathPromise.completeExceptionally(new SCMSecurityException("CSR inspection did not complete."));
+      return certPathPromise;
+    }
     if (csrInspection.isCompletedExceptionally()) {
       try {
         csrInspection.get();
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
index aaa9aefc1f8..be717dab749 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
@@ -31,6 +31,9 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -48,6 +51,7 @@
 import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
@@ -70,6 +74,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.mockito.MockedConstruction;
 
 /**
  * Tests the Default CA Server.
@@ -278,6 +283,34 @@ public void testBasicConstraintsAllowedForScmRoleOnly() throws Exception {
     assertThat(caStore.getStoredCertificates()).containsExactly(scmCert);
   }
 
+  @Test
+  public void testRequestCertificateRejectsUnfinishedInspection() throws Exception {
+    KeyPair keyPair = new HDDSKeyGenerator(securityConfig).generateKey();
+    PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
+        .addDnsName("hadoop.apache.org")
+        .setCA(false)
+        .setClusterID("ClusterID")
+        .setScmID("SCMID")
+        .setSubject("Ozone Cluster")
+        .setConfiguration(securityConfig)
+        .setKey(keyPair)
+        .build()
+        .generateCSR();
+
+    try (MockedConstruction<DefaultApprover> ignored = mockConstruction(DefaultApprover.class,
+        (approver, context) -> when(approver.inspectCSR(any())).thenReturn(new CompletableFuture<>()))) {
+      CertificateServer testCA = new DefaultCAServer("testCA", "ClusterID", "SCMID", caStore, new DefaultProfile(),
+          Paths.get(SCM_CA_CERT_STORAGE_DIR, SCM_CA_PATH).toString());
+      testCA.init(securityConfig, CAType.ROOT);
+
+      ExecutionException execution = assertThrows(ExecutionException.class,
+          () -> testCA.requestCertificate(csr, CertificateApprover.ApprovalType.TESTING_AUTOMATIC, OM,
+              String.valueOf(System.nanoTime())).get());
+      assertThat(execution.getCause().getMessage()).contains("CSR inspection did not complete");
+    }
+    assertThat(caStore.getStoredCertificates()).isEmpty();
+  }
+
   @Test
   public void testRequestCertificateWithInvalidSubjectFailure() throws Exception {
     KeyPair keyPair =
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultProfile.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultProfile.java
index 5f09b347b93..06ca02857e9 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultProfile.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultProfile.java
@@ -18,12 +18,19 @@
 package org.apache.hadoop.hdds.security.x509.certificate.authority;
 
 import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.security.KeyPair;
+import java.util.concurrent.CompletableFuture;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.security.SecurityConfig;
 import org.apache.hadoop.hdds.security.exception.SCMSecurityException;
@@ -135,6 +142,44 @@ public void testVerifyCertificateInvalidKeys() throws Exception {
     assertFalse(approver.verifyPkcs10Request(csr));
   }
 
+  @Test
+  public void testInspectCsrCompletesWhenApproved() throws Exception {
+    PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
+        .addDnsName("hadoop.apache.org")
+        .setCA(false)
+        .setClusterID("ClusterID")
+        .setScmID("SCMID")
+        .setSubject("Ozone Cluster")
+        .setConfiguration(securityConfig)
+        .setKey(keyPair)
+        .build()
+        .generateCSR();
+    assertThat(approver.inspectCSR(csr)).isCompletedWithValue(null);
+  }
+
+  @Test
+  public void testInspectCsrStopsAtFirstFailure() throws Exception {
+    KeyPair newKeyPair = new HDDSKeyGenerator(securityConfig).generateKey();
+    KeyPair wrongKey = new KeyPair(keyPair.getPublic(), newKeyPair.getPrivate());
+    PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
+        .addDnsName("hadoop.apache.org")
+        .setCA(false)
+        .setClusterID("ClusterID")
+        .setScmID("SCMID")
+        .setSubject("Ozone Cluster")
+        .setConfiguration(securityConfig)
+        .setKey(wrongKey)
+        .build()
+        .generateCSR();
+    DefaultProfile profile = spy(new DefaultProfile());
+    CompletableFuture<Void> inspection = new DefaultApprover(profile, securityConfig).inspectCSR(csr);
+    assertThat(inspection).isCompletedExceptionally();
+    assertThatThrownBy(inspection::get).cause().isInstanceOf(SCMSecurityException.class)
+        .hasMessage("Failed to verify the CSR.");
+    // The signature check failed, so the subject is not inspected.
+    verify(profile, never()).validateRDN(any());
+  }
+
   /**
    * Tests that normal valid extensions work with the default profile.
    */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org