test: fix SSLSNITest

diennea · Dec 10, 2024 · 2f96899 · 2f96899
1 parent 3c76956
commit 2f96899
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/carapace-server/src/main/java/org/carapaceproxy/utils/CertificatesUtils.java b/carapace-server/src/main/java/org/carapaceproxy/utils/CertificatesUtils.java
@@ -254,16 +254,16 @@ public static boolean certificateMatches(
         if (certificate.getSubjectAltNames() == null || certificate.getSubjectAltNames().isEmpty()) {
             if (exact) {
                 return !certificate.isWildcard() && hostname.equals(certificate.getHostname());
-            } else {
-                return certificate.isWildcard() && hostname.endsWith(certificate.getHostname());
             }
+            return certificate.isWildcard() && hostname.endsWith(certificate.getHostname());
         }
-        for (final var name : certificate.getNames()) {
-            final var wildcard = isWildcard(name);
-            if (exact) {
-                return !wildcard && hostname.equals(name);
-            } else {
-                return wildcard && hostname.endsWith(removeWildcard(name));
+        for (final String name : certificate.getNames()) {
+            final boolean wildcard = isWildcard(name);
+            if (exact && !wildcard && hostname.equals(name)) {
+                return true;
+            }
+            if (!exact && wildcard && hostname.endsWith(CertificatesUtils.removeWildcard(name))) {
+                return true;
             }
         }
         return false;