From 2d4cfe51f97659f3eee8b0b25fcf99359283fa98 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Tue, 13 Apr 2021 10:30:58 -0400 Subject: [PATCH] Disable TLS tests related to v1.1 (#1074) There is no need for this test now because we've past the enforcement date. We should take out the entire enforcement date logic but right now this test is failing because TLS 1.1 is not being supported anymore by the latest release of JDK 11. The other test is a bit tricky to fix, see comment. Disable these tests for now to unblock development. --- .../networking/handler/SslServerInitializerTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/networking/src/test/java/google/registry/networking/handler/SslServerInitializerTest.java b/networking/src/test/java/google/registry/networking/handler/SslServerInitializerTest.java index 69c81ac5f..b3a321bf3 100644 --- a/networking/src/test/java/google/registry/networking/handler/SslServerInitializerTest.java +++ b/networking/src/test/java/google/registry/networking/handler/SslServerInitializerTest.java @@ -53,6 +53,7 @@ import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; import org.joda.time.DateTime; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -306,6 +307,11 @@ class SslServerInitializerTest { assertThat(sslSession.getPeerCertificates()).asList().containsExactly(serverSsc.cert()); } + // This test is a bit tricky to fix because apparently some new OpenJDK 11 version does no + // support TLS 1.1 anymore, and in that case it throws a ClosedChannelException instead of a + // SSLHandShakeException. It's going to be hard to accommodate both the OpenSSL and the JDK + // provider. Disable it for now to unblock people. + @Disabled @ParameterizedTest @MethodSource("provideTestCombinations") void testFailure_protocolNotAccepted(SslProvider sslProvider) throws Exception { @@ -330,6 +336,7 @@ class SslServerInitializerTest { SSLHandshakeException.class); } + @Disabled @ParameterizedTest @MethodSource("provideTestCombinations") void testSuccess_protocolNotAccepted_beforeEnforcementDate(SslProvider sslProvider)