fix(sslcontext): ignore empty certs (#74)

bancolombia · Sep 17, 2024 · 7a26650 · 7a26650
1 parent d93b188
commit 7a26650
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -290,4 +290,5 @@ gradle-app.setting
 *.log.*
 FFDC
 commons-jms-utils/src/main/java/co/com/bancolombia/commons/jms/internal/models/eda
-examples/mq-reactive/src/main/java/co/com/bancolombia/sample/app/config/MQRegistryConfig.java
+examples/mq-reactive/src/main/java/co/com/bancolombia/sample/app/config/MQRegistryConfig.java
+**/SSLContextCreator.java
diff --git a/commons-jms-utils/src/main/java/co/com/bancolombia/commons/jms/security/SSLContextUtils.java b/commons-jms-utils/src/main/java/co/com/bancolombia/commons/jms/security/SSLContextUtils.java
@@ -145,11 +145,13 @@ protected static void loadFromPem(AtomicInteger sequence, CertificateFactory cer
                                       String certs) throws KeyStoreException, CertificateException {
         String[] pemCerts = certs.split("-----END CERTIFICATE-----");
         for (String pem : pemCerts) {
-            String fullPem = pem + "-----END CERTIFICATE-----\n";
-            X509Certificate cert = (X509Certificate) certFactory
-                    .generateCertificate(new ByteArrayInputStream(fullPem.getBytes()));
-            log.log(Level.FINE, "Loading cert: " + cert.getSubjectX500Principal().getName());
-            trustStore.setCertificateEntry(Integer.toString(sequence.incrementAndGet()), cert);
+            if (pem.contains("BEGIN CERTIFICATE")) {
+                String fullPem = pem + "-----END CERTIFICATE-----\n";
+                X509Certificate cert = (X509Certificate) certFactory
+                        .generateCertificate(new ByteArrayInputStream(fullPem.getBytes()));
+                log.log(Level.FINE, "Loading cert: " + cert.getSubjectX500Principal().getName());
+                trustStore.setCertificateEntry(Integer.toString(sequence.incrementAndGet()), cert);
+            }
         }
     }