HTTPCLIENT-2357, regression: Classic HttpClient fails to release connect in case of a proxy authentication failure
This commit is contained in:
Oleg Kalnichevski
parent
be62a1b726
commit
ff87bf0075
|
|
@ -30,8 +30,10 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
|
|||
import org.apache.hc.client5.testing.compatibility.async.CachingHttpAsyncClientCompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.async.HttpAsyncClientCompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.async.HttpAsyncClientHttp1CompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.async.HttpAsyncClientProxyCompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.sync.CachingHttpClientCompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.sync.HttpClientCompatibilityTest;
|
||||
import org.apache.hc.client5.testing.compatibility.sync.HttpClientProxyCompatibilityTest;
|
||||
import org.apache.hc.core5.http.HttpHost;
|
||||
import org.apache.hc.core5.http.URIScheme;
|
||||
import org.apache.hc.core5.http2.HttpVersionPolicy;
|
||||
|
|
@ -323,4 +325,24 @@ class ApacheHTTPDSquidCompatibilityIT {
|
|||
|
||||
}
|
||||
|
||||
@Nested
|
||||
@DisplayName("Classic client: HTTP/1.1, connection via password protected proxy")
|
||||
class HttpClientProxy extends HttpClientProxyCompatibilityTest {
|
||||
|
||||
public HttpClientProxy() throws Exception {
|
||||
super(targetInternalTlsHost(), proxyPwProtectedContainerHost());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Nested
|
||||
@DisplayName("Async client: HTTP/1.1, connection via password protected proxy")
|
||||
class AsyncClientProxy extends HttpAsyncClientProxyCompatibilityTest {
|
||||
|
||||
public AsyncClientProxy() throws Exception {
|
||||
super(targetInternalTlsHost(), proxyPwProtectedContainerHost());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.hc.client5.testing.compatibility.async;
|
||||
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import org.apache.hc.client5.http.ContextBuilder;
|
||||
import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
|
||||
import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
|
||||
import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
|
||||
import org.apache.hc.client5.http.auth.AuthScope;
|
||||
import org.apache.hc.client5.http.auth.Credentials;
|
||||
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
|
||||
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
|
||||
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
|
||||
import org.apache.hc.client5.http.protocol.HttpClientContext;
|
||||
import org.apache.hc.client5.testing.extension.async.HttpAsyncClientResource;
|
||||
import org.apache.hc.core5.http.HttpHost;
|
||||
import org.apache.hc.core5.http.HttpStatus;
|
||||
import org.apache.hc.core5.http2.HttpVersionPolicy;
|
||||
import org.apache.hc.core5.util.Timeout;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.RegisterExtension;
|
||||
|
||||
public abstract class HttpAsyncClientProxyCompatibilityTest {
|
||||
|
||||
static final Timeout TIMEOUT = Timeout.ofSeconds(5);
|
||||
|
||||
private final HttpHost target;
|
||||
private final HttpHost proxy;
|
||||
@RegisterExtension
|
||||
private final HttpAsyncClientResource clientResource;
|
||||
private final BasicCredentialsProvider credentialsProvider;
|
||||
|
||||
public HttpAsyncClientProxyCompatibilityTest(final HttpHost target, final HttpHost proxy) throws Exception {
|
||||
this.target = target;
|
||||
this.proxy = proxy;
|
||||
this.clientResource = new HttpAsyncClientResource(HttpVersionPolicy.FORCE_HTTP_1);
|
||||
this.clientResource.configure(builder -> builder.setProxy(proxy));
|
||||
this.credentialsProvider = new BasicCredentialsProvider();
|
||||
}
|
||||
|
||||
CloseableHttpAsyncClient client() {
|
||||
return clientResource.client();
|
||||
}
|
||||
|
||||
HttpClientContext context() {
|
||||
return ContextBuilder.create()
|
||||
.useCredentialsProvider(credentialsProvider)
|
||||
.build();
|
||||
}
|
||||
|
||||
void addCredentials(final AuthScope authScope, final Credentials credentials) {
|
||||
credentialsProvider.setCredentials(authScope, credentials);
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_auth_failure_wrong_proxy_credentials() throws Exception {
|
||||
addCredentials(
|
||||
new AuthScope(proxy),
|
||||
new UsernamePasswordCredentials("testuser", "wrong password".toCharArray()));
|
||||
final CloseableHttpAsyncClient client = client();
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
final HttpClientContext context = context();
|
||||
|
||||
final SimpleHttpRequest httpGetSecret = SimpleRequestBuilder.get()
|
||||
.setHttpHost(target)
|
||||
.setPath("/")
|
||||
.build();
|
||||
final Future<SimpleHttpResponse> future = client.execute(httpGetSecret, context, null);
|
||||
final SimpleHttpResponse response = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
|
||||
Assertions.assertEquals(HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED, response.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
/*
|
||||
* ====================================================================
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
package org.apache.hc.client5.testing.compatibility.sync;
|
||||
|
||||
import org.apache.hc.client5.http.ContextBuilder;
|
||||
import org.apache.hc.client5.http.auth.AuthScope;
|
||||
import org.apache.hc.client5.http.auth.Credentials;
|
||||
import org.apache.hc.client5.http.auth.CredentialsStore;
|
||||
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
|
||||
import org.apache.hc.client5.http.classic.methods.HttpGet;
|
||||
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
|
||||
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
|
||||
import org.apache.hc.client5.http.protocol.HttpClientContext;
|
||||
import org.apache.hc.client5.testing.extension.sync.HttpClientResource;
|
||||
import org.apache.hc.core5.http.ClassicHttpRequest;
|
||||
import org.apache.hc.core5.http.ClassicHttpResponse;
|
||||
import org.apache.hc.core5.http.HttpHost;
|
||||
import org.apache.hc.core5.http.HttpStatus;
|
||||
import org.apache.hc.core5.http.io.entity.EntityUtils;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.RegisterExtension;
|
||||
|
||||
public abstract class HttpClientProxyCompatibilityTest {
|
||||
|
||||
private final HttpHost target;
|
||||
private final HttpHost proxy;
|
||||
@RegisterExtension
|
||||
private final HttpClientResource clientResource;
|
||||
private final CredentialsStore credentialsProvider;
|
||||
|
||||
public HttpClientProxyCompatibilityTest(final HttpHost target, final HttpHost proxy) throws Exception {
|
||||
this.target = target;
|
||||
this.proxy = proxy;
|
||||
this.clientResource = new HttpClientResource();
|
||||
this.clientResource.configure(builder -> builder.setProxy(proxy));
|
||||
this.credentialsProvider = new BasicCredentialsProvider();
|
||||
}
|
||||
|
||||
CloseableHttpClient client() {
|
||||
return clientResource.client();
|
||||
}
|
||||
|
||||
HttpClientContext context() {
|
||||
return ContextBuilder.create()
|
||||
.useCredentialsProvider(credentialsProvider)
|
||||
.build();
|
||||
}
|
||||
|
||||
void addCredentials(final AuthScope authScope, final Credentials credentials) {
|
||||
credentialsProvider.setCredentials(authScope, credentials);
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_auth_failure_wrong_proxy_credentials() throws Exception {
|
||||
addCredentials(new AuthScope(proxy),
|
||||
new UsernamePasswordCredentials("testuser", "wrong password".toCharArray()));
|
||||
|
||||
final CloseableHttpClient client = client();
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
final HttpClientContext context = context();
|
||||
|
||||
final ClassicHttpRequest request = new HttpGet("/");
|
||||
try (ClassicHttpResponse response = client.executeOpen(target, request, context)) {
|
||||
Assertions.assertEquals(HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED, response.getCode());
|
||||
EntityUtils.consume(response.getEntity());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -295,7 +295,7 @@ public final class ConnectExec implements ExecChainHandler {
|
|||
response.setEntity(new ByteArrayEntity(
|
||||
EntityUtils.toByteArray(entity, 4096),
|
||||
ContentType.parseLenient(entity.getContentType())));
|
||||
execRuntime.disconnectEndpoint();
|
||||
execRuntime.discardEndpoint();
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ class TestConnectExec {
|
|||
|
||||
final ExecChain.Scope scope = new ExecChain.Scope("test", route, request, execRuntime, context);
|
||||
exec.execute(request, scope, execChain);
|
||||
Mockito.verify(execRuntime, Mockito.atLeastOnce()).disconnectEndpoint();
|
||||
Mockito.verify(execRuntime, Mockito.atLeastOnce()).discardEndpoint();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
Loading…
Reference in New Issue