fix unit test

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
hashgraph · Nov 19, 2024 · aa0b34e · aa0b34e
1 parent 0a59249
commit aa0b34e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...l/src/test/java/com/hedera/node/app/service/addressbook/impl/test/CertificatePemTest.java b/...l/src/test/java/com/hedera/node/app/service/addressbook/impl/test/CertificatePemTest.java
@@ -24,7 +24,6 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.hedera.hapi.node.base.ResponseCodeEnum;
@@ -73,8 +72,7 @@ void invalidCertificatePem() throws CertificateException, IOException {
         final var cert = readCertificatePemFile(pemFilePath);
         final var test = Path.of(tmpDir.getPath() + "/test");
         Files.write(test, cert.getEncoded());
-        final var genCert = readCertificatePemFile(test);
-        assertNull(genCert);
+        assertThrows(CertificateException.class, () -> readCertificatePemFile(test));
     }
 
     @Test

diff --git a/...book-service/src/main/java/com/hedera/node/app/service/addressbook/AddressBookHelper.java b/...book-service/src/main/java/com/hedera/node/app/service/addressbook/AddressBookHelper.java
@@ -119,13 +119,18 @@ public static X509Certificate readCertificatePemFile(@NonNull final Path pemFile
     public static X509Certificate readCertificatePemFile(@NonNull final InputStream in)
             throws IOException, CertificateException {
         requireNonNull(in);
+        Object entry;
         try (final var parser = new PEMParser(new InputStreamReader(in))) {
-            final var entry = parser.readObject();
-            if (!(entry instanceof X509CertificateHolder holder)) {
-                throw new CertificateException();
+            while ((entry = parser.readObject()) != null) {
+                if (entry instanceof X509CertificateHolder ch) {
+                    return new JcaX509CertificateConverter().getCertificate(ch);
+                } else {
+                    throw new CertificateException(
+                            "Not X509 Certificate, it is " + entry.getClass().getSimpleName());
+                }
             }
-            return new JcaX509CertificateConverter().getCertificate(holder);
         }
+        throw new CertificateException("No X509 Certificate found in the PEM file");
     }
 
     /**