diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2021-02-19 15:44:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-19 15:44:49 +0100 |
commit | 80a12494320d9707351438e0505a53ffefe2442d (patch) | |
tree | 5fa39ffb9d87fc896c1d5a95fbe1109b193898b6 /jdisc_http_service | |
parent | 8ac7716a731e23cd8e536950d44f8b99c179ec33 (diff) |
Revert "Handle alternative error message for incompatible TLS protocol version"
Diffstat (limited to 'jdisc_http_service')
2 files changed, 3 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java index 57b41661cb1..64f70564137 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java @@ -16,8 +16,7 @@ enum SslHandshakeFailure { MetricDefinitions.SSL_HANDSHAKE_FAILURE_INCOMPATIBLE_PROTOCOLS, "INCOMPATIBLE_CLIENT_PROTOCOLS", "(Client requested protocol \\S+? is not enabled or supported in server context" + - "|The client supported protocol versions \\[.+?\\] are not accepted by server preferences \\[.+?\\]" + - "|No appropriate protocol \\(protocol is disabled or cipher suites are inappropriate\\))"), + "|The client supported protocol versions \\[.+?\\] are not accepted by server preferences \\[.+?\\])"), INCOMPATIBLE_CIPHERS( MetricDefinitions.SSL_HANDSHAKE_FAILURE_INCOMPATIBLE_CIPHERS, "INCOMPATIBLE_CLIENT_CIPHER_SUITES", diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 8ac1e5c1f29..f61939de90b 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -44,6 +44,7 @@ import org.eclipse.jetty.client.ProxyProtocolClientConnectionFactory.V2; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.server.handler.AbstractHandlerContainer; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -653,6 +654,7 @@ public class HttpServerTest { } @Test + @Ignore public void requireThatMetricIsIncrementedWhenClientUsesIncompatibleTlsVersion() throws IOException { Path privateKeyFile = tmpFolder.newFile().toPath(); Path certificateFile = tmpFolder.newFile().toPath(); |