Merge pull request #1353 from kstekovi/UNDERTOW-2112_2.2.x

fl4via · web-flow · commit 9a06b56ec8e3 · 2022-08-11T01:49:27.000-03:00
UNDERTOW-2112 Client Cert Renegotiation is not supported by JDK14 and newer.
diff --git a/core/src/test/java/io/undertow/server/security/ClientCertRenegotiationTestCase.java b/core/src/test/java/io/undertow/server/security/ClientCertRenegotiationTestCase.java
@@ -34,6 +34,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,6 +68,8 @@ protected List<AuthenticationMechanism> getTestMechanisms() {
 
     @BeforeClass
     public static void startSSL() throws Exception {
+        Assume.assumeTrue("UNDERTOW-2112 New version TLSv1.3 and JDK14 and newer versions are breaking this feature",
+                getJavaSpecificationVersion() < 14);
         DefaultServer.startSSLServer(OptionMap.create(SSL_CLIENT_AUTH_MODE, NOT_REQUESTED));
         clientSSLContext = DefaultServer.getClientSSLContext();
     }
@@ -149,4 +152,10 @@ public void testClientCertSuccessWithLargePostBody() throws Exception {
         HttpClientUtils.readResponse(result);
         assertSingleNotificationType(EventType.AUTHENTICATED);
     }
+
+    private static int getJavaSpecificationVersion() {
+        String versionString = System.getProperty("java.specification.version");
+        versionString = versionString.startsWith("1.") ? versionString.substring(2) : versionString;
+        return Integer.parseInt(versionString);
+    }
 }
