From a5ef97f02afcbcd648f242eace2647f7234ccdd2 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 15 Feb 2021 22:57:04 +0100 Subject: [PATCH] Fixes #5973 - Proxy client TLS authentication example. Fixes test mistakenly missing the proper request tag. Signed-off-by: Simone Bordet --- .../org/eclipse/jetty/proxy/ClientAuthProxyTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ClientAuthProxyTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ClientAuthProxyTest.java index c27504edab29..891f55818992 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ClientAuthProxyTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ClientAuthProxyTest.java @@ -333,8 +333,8 @@ protected KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception public void testClientAuthProxyingWithSSLSessionResumptionDisabled() throws Exception { // To user the same HttpClient and server hostName, we need to disable - // SSLSession caching, which is only possible by creating SSLEngine without - // peer host information. + // SSLSession caching, which is only possible by creating SSLEngine + // without peer host information. // This is more CPU intensive because TLS sessions can never be resumed. startServer(); @@ -347,7 +347,7 @@ protected Request newProxyRequest(HttpServletRequest request, String rewrittenTa Request proxyRequest = super.newProxyRequest(request, rewrittenTarget); proxyRequest.port(serverConnector.getLocalPort()); // Tag the request. - proxyRequest.tag(user); + proxyRequest.tag(new AliasTLSTag(user)); return proxyRequest; } @@ -381,8 +381,7 @@ protected KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception clientTLS.setKeyStorePath(MavenTestingUtils.getTestResourceFile("client_auth/proxy_keystore.p12").getAbsolutePath()); clientTLS.setKeyStorePassword("storepwd"); clientTLS.setKeyStoreType("PKCS12"); - HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP(1); - return new HttpClient(transport, clientTLS); + return new HttpClient(new HttpClientTransportOverHTTP(1), clientTLS); } });