0005896: Fixed ValidatorException while validating self-signed X509 c…

…ertificate
JumpMind · Jun 27, 2023 · 36b43b1 · 36b43b1
1 parent b05b33c
commit 36b43b1
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java b/...-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java
@@ -80,11 +80,22 @@ public void checkServerTrusted(X509Certificate[] certificates, String authType)
                 log.debug("X509Certificate[" + i + "]=" + certificates[i]);
             }
         }
-        if ((certificates != null) && (certificates.length == 1)) {
-            certificates[0].checkValidity();
-        } else {
-            standardTrustManager.checkServerTrusted(certificates, authType);
+        if (certificates != null) {
+            if (certificates.length == 1 && certificates[0] != null) {
+                certificates[0].checkValidity();
+                return;
+            } else if (certificates.length > 1 && certificates[0] != null) {
+                boolean certificatesAreEqual = true;
+                for (int i = 1; i < certificates.length; i++) {
+                    certificatesAreEqual &= certificates[0].equals(certificates[i]);
+                }
+                if (certificatesAreEqual) {
+                    certificates[0].checkValidity();
+                    return;
+                }
+            }
         }
+        standardTrustManager.checkServerTrusted(certificates, authType);
     }
 
     /**