Skip to content

Fix ApacheHttpClient Proxy Preemptive Auth Failure #6333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 13, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-cefa8ba.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Fixed 407 Proxy Authentication error when preemptiveBasicAuthenticationEnabled is true. Fixes [#5884](https://github.com/aws/aws-sdk-java-v2/issues/5884)."
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.UncheckedIOException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.NTCredentials;
Expand All @@ -30,6 +31,7 @@
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.message.BasicHeader;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.http.apache.ProxyConfiguration;
import software.amazon.awssdk.utils.Logger;
Expand Down Expand Up @@ -149,6 +151,11 @@ private static void addPreemptiveAuthenticationProxy(HttpClientContext clientCon
AuthCache authCache = new BasicAuthCache();
// Generate BASIC scheme object and add it to the local auth cache
BasicScheme basicAuth = new BasicScheme();
try {
basicAuth.processChallenge(new BasicHeader(AUTH.PROXY_AUTH, "BASIC realm=default"));
} catch (Exception e) {
logger.warn(() -> "Failed to process synthetic challenge for preemptive proxy authentication: " + e.getMessage());
}
authCache.put(targetHost, basicAuth);

clientContext.setCredentialsProvider(credsProvider);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file 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.
*/

package software.amazon.awssdk.http.apache;

import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.any;
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
import static com.github.tomakehurst.wiremock.client.WireMock.matching;
import static org.assertj.core.api.Assertions.assertThat;

import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import java.net.URI;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.http.HttpExecuteRequest;
import software.amazon.awssdk.http.HttpExecuteResponse;
import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.SdkHttpMethod;
import software.amazon.awssdk.http.SdkHttpRequest;

/**
* Tests proxy preemptive authentication functionality.
*
* Verifies that when preemptiveBasicAuthenticationEnabled(true) is configured,
* the Proxy-Authorization header is sent with the first request to the proxy.
*/
public class ProxyPreemptiveAuthTest {

private WireMockServer proxyServer;
private SdkHttpClient httpClient;

@BeforeEach
public void setup() {
proxyServer = new WireMockServer(WireMockConfiguration.options().dynamicPort());
proxyServer.start();
}

@AfterEach
public void teardown() {
if (httpClient != null) {
httpClient.close();
}
if (proxyServer != null) {
proxyServer.stop();
}
}

@Test
public void testPreemptiveAuthenticationSendsProxyAuthorizationHeader() throws Exception {
proxyServer.stubFor(any(anyUrl())
.withHeader("Proxy-Authorization", matching("Basic .+"))
.willReturn(aResponse()
.withStatus(200)
.withBody("Success")));

// Create HTTP client with preemptive proxy authentication enabled
httpClient = ApacheHttpClient.builder()
.proxyConfiguration(ProxyConfiguration.builder()
.endpoint(URI.create("http://localhost:" + proxyServer.port()))
.username("testuser")
.password("testpass")
.preemptiveBasicAuthenticationEnabled(true)
.build())
.build();

// Create a request
SdkHttpRequest request = SdkHttpRequest.builder()
.method(SdkHttpMethod.GET)
.uri(URI.create("http://example.com/test"))
.build();

HttpExecuteRequest executeRequest = HttpExecuteRequest.builder()
.request(request)
.build();

// Execute the request - should succeed with preemptive auth header
HttpExecuteResponse response = httpClient.prepareRequest(executeRequest).call();
assertThat(response.httpResponse().statusCode()).isEqualTo(200);

// Verify that the proxy received the request with Proxy-Authorization header
proxyServer.verify(WireMock.getRequestedFor(anyUrl())
.withHeader("Proxy-Authorization", matching("Basic .+")));
}
}
Loading