Skip to content

fix(netty): preserve QUERY across redirects #2317

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.

Sign up for GitHub

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

Open
mkurz wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(netty): preserve QUERY across redirects #2317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4596aa0
Preserve QUERY redirects per RFC 10008
mkurz Aug 25, 2026
d3f4d9a
Document QUERY redirect rationale
mkurz Sep 1, 2026
8171795
Minimize redirect condition changes
mkurz Sep 1, 2026
f6a09ef
Derive QUERY from Netty
mkurz Sep 1, 2026
a977a51
Pin existing non-QUERY redirect behavior
mkurz Sep 1, 2026
69393b5
Test non-repeatable QUERY redirects
mkurz Sep 1, 2026
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
20 changes: 15 additions & 5 deletions client/src/main/java/org/asynchttpclient/netty/handler/intercept/Redirect30xInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import static org.asynchttpclient.util.HttpConstants.Methods.GET;
import static org.asynchttpclient.util.HttpConstants.Methods.HEAD;
import static org.asynchttpclient.util.HttpConstants.Methods.OPTIONS;
import static org.asynchttpclient.util.HttpConstants.Methods.QUERY;
import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.FOUND_302;
import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.MOVED_PERMANENTLY_301;
import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.PERMANENT_REDIRECT_308;
Expand Down Expand Up @@ -116,11 +117,20 @@ public boolean exitAfterHandlingRedirect(Channel channel, NettyResponseFuture<?>
future.setScramContext(null);

String originalMethod = request.getMethod();

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put the RFC 10008 2.5 reference in a comment here? Every other odd thing in this method says why it is there, and this is the least obvious line in it.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the RFC 10008 section 2.5 explanation directly above queryRedirect in d3f4d9a.

boolean switchToGet = !originalMethod.equals(GET) &&
!originalMethod.equals(OPTIONS) &&
!originalMethod.equals(HEAD) &&
(statusCode == MOVED_PERMANENTLY_301 || statusCode == SEE_OTHER_303 || statusCode == FOUND_302 && !config.isStrict302Handling());
boolean keepBody = statusCode == TEMPORARY_REDIRECT_307 || statusCode == PERMANENT_REDIRECT_308 || statusCode == FOUND_302 && config.isStrict302Handling();
boolean isQuery = QUERY.equals(originalMethod);
boolean methodAlreadyPreserved = originalMethod.equals(GET) ||
originalMethod.equals(OPTIONS) || originalMethod.equals(HEAD);
boolean strict302 = statusCode == FOUND_302 && config.isStrict302Handling();
// RFC 10008 section 2.5 excludes QUERY from the legacy POST-to-GET behavior.
boolean queryRedirect = isQuery &&
(statusCode == MOVED_PERMANENTLY_301 || statusCode == FOUND_302);
boolean legacyRedirectToGet = statusCode == MOVED_PERMANENTLY_301 ||
Comment on lines +123 to +127

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

queryRedirect and legacyRedirectToGet are each read once, on the next line. methodAlreadyPreserved also reads backwards: it is false for QUERY, but the method is preserved for QUERY on 301. Did you consider scoping the rewrite to POST instead? RFC 9110 only defines it for POST, so QUERY would need no special case at all. It changes PUT and DELETE too so probably its own PR, but then you are not adding a branch you have to take out again later.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a local follow-up branch which already implements this: the legacy rewrite is scoped to POST, PUT/PATCH/DELETE/custom methods are tested on 301 and 302, and the QUERY-specific condition in this PR becomes unnecessary.

There are two possible ways to sequence it: land this narrow PR and follow it with the broader change, or close this PR and open the broader one with the QUERY constant and regression tests carried over. I lean toward the latter given your point about not adding a branch that is removed again, but the narrow PR would allow QUERY conformance to land independently if the compatibility change for existing PUT/PATCH/DELETE users needs more discussion. Which would you prefer?

(statusCode == FOUND_302 && !strict302);
boolean switchToGet = !methodAlreadyPreserved &&
(statusCode == SEE_OTHER_303 || (!isQuery && legacyRedirectToGet));
boolean keepBody = queryRedirect ||
statusCode == TEMPORARY_REDIRECT_307 || statusCode == PERMANENT_REDIRECT_308 ||
Comment on lines +130 to +132

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sends the QUERY body to whatever host the 301 points at. We strip Authorization and Cookie when the origin changes, but with QUERY the body is the query, so a cached or injected 301 gets the whole thing where before it got an empty GET. 307 and 308 already behave like this, but 301 and 302 are the cacheable ones. Can we require sameBase for the body here, or gate it on a config flag?

@mkurz mkurz Sep 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed that this needs an explicit policy decision. My preference for this conformance fix is to retain AHC’s existing keep-body redirect policy: AHC already replays request bodies across origins for 307, 308, and strict 302 while stripping credentials.

Requiring sameBase only for QUERY on 301/302 cannot safely mean dropping the body: that would preserve the QUERY method while silently changing the query itself, contrary to RFC 10008.

On the config-flag option: I think that is the right mechanism if we want this restriction, but it should apply uniformly to every cross-origin keep-body redirect, not only QUERY on 301/302, and it should refuse the redirect rather than strip the body. Your caching point is well taken: when a 301/302 response is cached, it can repeatedly cause cross-origin body replay without a new redirect response. That strengthens the case for a configurable cross-origin body-replay policy; I do not think it argues for QUERY following a different policy from every other body-bearing method.

Would you prefer that uniform policy to be designed as part of this PR, or is retaining AHC’s existing trust model acceptable here while we discuss the broader policy separately?

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The block this feeds, at line 158, covers six of the body kinds. getFile(), getStreamData(), getByteBufData() and getCompositeByteData() all fall through, and QUERY is not POST/PUT/PATCH so we do not set ZERO_CONTENT_LENGTH either. A QUERY with a File body then gets redirected with its Content-Type and no content at all, which is the case this PR is meant to fix. It is pre existing for 307 and 308, but this PR is what makes it reachable for QUERY.

Its order does not match NettyRequestFactory.body() either. That one takes byteData before formParams and bodyParts before bodyGenerator, we do the reverse, so a request carrying both sends a different body after the redirect than it did on the first hop.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now fixed by #2316, which has merged into main and is included in this branch after rebasing. Redirect body replay is centralized in copyBody, covers every request-body representation, and follows the same precedence as NettyRequestFactory.body(). The QUERY keep-body path therefore no longer drops File, InputStream, ByteBuf, or composite byte-array bodies or selects a different coexisting representation.

strict302;

HttpHeaders responseHeaders = response.headers();
String location = responseHeaders.get(LOCATION);
Expand Down
1 change: 1 addition & 0 deletions client/src/main/java/org/asynchttpclient/util/HttpConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public static final class Methods {
public static final String PATCH = HttpMethod.PATCH.name();
public static final String POST = HttpMethod.POST.name();
public static final String PUT = HttpMethod.PUT.name();
public static final String QUERY = HttpMethod.QUERY.name();
public static final String TRACE = HttpMethod.TRACE.name();

private Methods() {
Expand Down
172 changes: 172 additions & 0 deletions client/src/test/java/org/asynchttpclient/RedirectBodyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@
import org.apache.commons.io.IOUtils;
import org.asynchttpclient.filter.FilterContext;
import org.asynchttpclient.filter.ResponseFilter;
import org.asynchttpclient.request.body.generator.ByteArrayBodyGenerator;
import org.asynchttpclient.request.body.generator.InputStreamBodyGenerator;
import org.asynchttpclient.request.body.multipart.InputStreamPart;
import org.asynchttpclient.request.body.multipart.StringPart;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;

import java.io.ByteArrayInputStream;
import java.io.FilterInputStream;
Expand All @@ -49,6 +52,9 @@
import static io.netty.handler.codec.http.HttpHeaderNames.LOCATION;
import static org.asynchttpclient.Dsl.asyncHttpClient;
import static org.asynchttpclient.Dsl.config;
import static org.asynchttpclient.util.HttpConstants.Methods.GET;
import static org.asynchttpclient.util.HttpConstants.Methods.POST;
import static org.asynchttpclient.util.HttpConstants.Methods.QUERY;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
Expand All @@ -64,13 +70,15 @@ public class RedirectBodyTest extends AbstractBasicTest {
private static final List<String> receivedContentLengths = new CopyOnWriteArrayList<>();
private static volatile boolean redirectAlreadyPerformed;
private static volatile String receivedContentType;
private static volatile String receivedMethod;
private static volatile Path fileToDeleteBeforeRedirect;

@BeforeEach
public void setUp() {
receivedContentLengths.clear();
redirectAlreadyPerformed = false;
receivedContentType = null;
receivedMethod = null;
fileToDeleteBeforeRedirect = null;
}

Expand All @@ -94,6 +102,7 @@ public void handle(String pathInContext, Request request, HttpServletRequest htt

} else {
receivedContentType = request.getContentType();
receivedMethod = request.getMethod();
httpResponse.setStatus(200);
httpResponse.setContentLength(body.length);
if (body.length > 0) {
Expand All @@ -114,6 +123,7 @@ public void regular301LosesBody() throws Exception {

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "301").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(response.getResponseBody(), "");
assertEquals(GET, receivedMethod);
assertNull(receivedContentType);
}
}
Expand All @@ -126,6 +136,7 @@ public void regular302LosesBody() throws Exception {

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "302").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(response.getResponseBody(), "");
assertEquals(GET, receivedMethod);
assertNull(receivedContentType);
}
}
Expand All @@ -138,10 +149,24 @@ public void regular302StrictKeepsBody() throws Exception {

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "302").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(response.getResponseBody(), body);
assertEquals(POST, receivedMethod);
assertEquals(receivedContentType, contentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void regular303SwitchesToGetAndLosesBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
String body = "hello there";
String contentType = "text/plain; charset=UTF-8";

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "303").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals("", response.getResponseBody());
assertEquals(GET, receivedMethod);
assertNull(receivedContentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void regular307KeepsBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
Expand All @@ -150,10 +175,138 @@ public void regular307KeepsBody() throws Exception {

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "307").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(response.getResponseBody(), body);
assertEquals(POST, receivedMethod);
assertEquals(receivedContentType, contentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void regular308KeepsBody() throws Exception {

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition you rewrote also drives PUT, PATCH and DELETE, but every new test is POST or QUERY. One parameterized test over those three on 301 and 302 would pin the behavior the PR says it is not touching.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in a977a51. The parameterized test covers PUT, PATCH, and DELETE across both 301 and non-strict 302 and asserts the current GET rewrite, empty body, and removed Content-Type. If the broader POST-scoped rewrite lands later, these assertions will require an explicit update.

try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
String body = "hello there";
String contentType = "text/plain; charset=UTF-8";

Response response = c.preparePost(getTargetUrl()).setHeader(CONTENT_TYPE, contentType).setBody(body).setHeader("X-REDIRECT", "308").execute().get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(body, response.getResponseBody());
assertEquals(POST, receivedMethod);
assertEquals(contentType, receivedContentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query301KeepsMethodAndBody() throws Exception {
queryRedirectKeepsMethodAndBody(301, false);
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query302KeepsMethodAndBody() throws Exception {
queryRedirectKeepsMethodAndBody(302, false);
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query302StrictKeepsMethodAndBody() throws Exception {
queryRedirectKeepsMethodAndBody(302, true);
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query303SwitchesToGetAndDropsBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
String body = "hello there";
String contentType = "text/plain; charset=UTF-8";

Response response = c.prepare(QUERY, getTargetUrl())
.setHeader(CONTENT_TYPE, contentType)
.setBody(body)
.setHeader("X-REDIRECT", "303")
.execute()
.get(TIMEOUT, TimeUnit.SECONDS);
assertEquals("", response.getResponseBody());
assertEquals(GET, receivedMethod);
assertNull(receivedContentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query307KeepsMethodAndBody() throws Exception {
queryRedirectKeepsMethodAndBody(307, false);
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query308KeepsMethodAndBody() throws Exception {
queryRedirectKeepsMethodAndBody(308, false);
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query301KeepsRepeatableBodyGenerator() throws Exception {

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get one with a non repeatable generator too? A QUERY on 301 used to go out as a bodiless GET and complete, now it replays a consumed stream and fails the future through the guard from #2312. ByteArrayBodyGenerator is repeatable so this test does not see it.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in 69393b5. The test uses a non-empty, non-resettable InputStreamBodyGenerator and asserts the exact replay-guard IOException. Before the QUERY change, the request became a bodyless GET and completed, so the test discriminates the changed behavior.

try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
byte[] body = "hello there".getBytes(UTF_8);
String contentType = "text/plain; charset=UTF-8";

Response response = c.prepare(QUERY, getTargetUrl())
.setHeader(CONTENT_TYPE, contentType)
.setBody(new ByteArrayBodyGenerator(body))
.setHeader("X-REDIRECT", "301")
.execute()
.get(TIMEOUT, TimeUnit.SECONDS);
assertEquals("hello there", response.getResponseBody());
assertEquals(QUERY, receivedMethod);
assertEquals(contentType, receivedContentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void query301WithNonRepeatableBodyGeneratorFailsPromptly() throws Exception {
try (InputStream body = new FilterInputStream(new ByteArrayInputStream(REDIRECT_BODY)) {
@Override
public boolean markSupported() {
return false;
}

@Override
public synchronized void reset() throws IOException {
throw new IOException("reset not supported");
}
};
AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
ExecutionException thrown = assertThrows(ExecutionException.class,
() -> c.prepare(QUERY, getTargetUrl())
.setBody(new InputStreamBodyGenerator(body))
.setHeader("X-REDIRECT", "301")
.execute()
.get(TIMEOUT, TimeUnit.SECONDS));

IOException cause = assertInstanceOf(IOException.class, thrown.getCause());
assertEquals("HTTP/1 request body InputStream already consumed and cannot be reset for a retry",
cause.getMessage());
}
}

@ParameterizedTest(name = "{0} on {1} keeps the existing GET rewrite")
@CsvSource({
"PUT, 301",
"PUT, 302",
"PATCH, 301",
"PATCH, 302",
"DELETE, 301",
"DELETE, 302"
})
public void putPatchAndDelete301And302KeepExistingBehavior(String method, int statusCode) throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
String body = "hello there";
String contentType = "text/plain; charset=UTF-8";

Response response = c.prepare(method, getTargetUrl())
.setHeader(CONTENT_TYPE, contentType)
.setBody(body)
.setHeader("X-REDIRECT", Integer.toString(statusCode))
.execute()
.get(TIMEOUT, TimeUnit.SECONDS);
assertEquals("", response.getResponseBody());
assertEquals(GET, receivedMethod);
assertNull(receivedContentType);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void redirectPreservesPerRequestSettings() throws Exception {
Duration readTimeout = Duration.ofSeconds(7);
Expand Down Expand Up @@ -424,6 +577,25 @@ public void inputStreamMultipart307FailsPromptly() throws Exception {
}
}

private void queryRedirectKeepsMethodAndBody(int statusCode, boolean strict302Handling) throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config()
.setFollowRedirect(true)
.setStrict302Handling(strict302Handling))) {
String body = "hello there";
String contentType = "text/plain; charset=UTF-8";

Response response = c.prepare(QUERY, getTargetUrl())
.setHeader(CONTENT_TYPE, contentType)
.setBody(body)
.setHeader("X-REDIRECT", Integer.toString(statusCode))
.execute()
.get(TIMEOUT, TimeUnit.SECONDS);
assertEquals(body, response.getResponseBody());
assertEquals(QUERY, receivedMethod);
assertEquals(contentType, receivedContentType);
}
}

private static Response execute307(BoundRequestBuilder requestBuilder) throws Exception {
return requestBuilder
.setHeader(CONTENT_TYPE, CONTENT_TYPE_VALUE)
Expand Down
54 changes: 54 additions & 0 deletions client/src/test/java/org/asynchttpclient/RedirectCredentialSecurityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.concurrent.atomic.AtomicReference;

import static org.asynchttpclient.Dsl.basicAuthRealm;
import static org.asynchttpclient.util.HttpConstants.Methods.QUERY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
Expand Down Expand Up @@ -65,6 +66,11 @@ public class RedirectCredentialSecurityTest {
private static final AtomicReference<String> cookieOn307Target = new AtomicReference<>();
private static final AtomicReference<String> authOn308Target = new AtomicReference<>();
private static final AtomicReference<String> bodyOn308Target = new AtomicReference<>();
private static final AtomicReference<String> query301AuthOnTarget = new AtomicReference<>();
private static final AtomicReference<String> query301CookieOnTarget = new AtomicReference<>();
private static final AtomicReference<String> query301ContentTypeOnTarget = new AtomicReference<>();
private static final AtomicReference<String> query301MethodOnTarget = new AtomicReference<>();
private static final AtomicReference<String> query301BodyOnTarget = new AtomicReference<>();
private static final AtomicReference<String> lastCookieHeaderOnA = new AtomicReference<>();
private static final AtomicReference<String> lastCookieHeaderOnB = new AtomicReference<>();
private static final AtomicReference<String> cookieAtChainStep2 = new AtomicReference<>();
Expand Down Expand Up @@ -189,6 +195,24 @@ public static void startServers() throws Exception {
exchange.close();
});

serverA.createContext("/redirect-query-301-to-b", exchange -> {
exchange.getRequestBody().readAllBytes();
exchange.getResponseHeaders().add("Location", "http://127.0.0.1:" + portB + "/target-query-301");
exchange.sendResponseHeaders(301, -1);
exchange.close();
});

serverB.createContext("/target-query-301", exchange -> {
query301AuthOnTarget.set(exchange.getRequestHeaders().getFirst("Authorization"));
query301CookieOnTarget.set(exchange.getRequestHeaders().getFirst("Cookie"));
query301ContentTypeOnTarget.set(exchange.getRequestHeaders().getFirst("Content-Type"));
query301MethodOnTarget.set(exchange.getRequestMethod());
query301BodyOnTarget.set(new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8));
exchange.sendResponseHeaders(200, 0);
exchange.getResponseBody().close();
exchange.close();
});

// Endpoint reused by the HTTPS-to-HTTP downgrade test (target on server B over plain HTTP)
serverB.createContext("/target-after-downgrade", exchange -> {
authAfterHttpsDowngrade.set(exchange.getRequestHeaders().getFirst("Authorization"));
Expand Down Expand Up @@ -511,6 +535,36 @@ void redirect308CrossDomainStripsAuthButPreservesBody() throws Exception {
}
}

@Test
void query301CrossOriginStripsCredentialsAndPreservesRequest() throws Exception {
DefaultAsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder()
.setFollowRedirect(true)
.build();
try (DefaultAsyncHttpClient client = new DefaultAsyncHttpClient(config)) {
query301AuthOnTarget.set(null);
query301CookieOnTarget.set(null);
query301ContentTypeOnTarget.set(null);
query301MethodOnTarget.set(null);
query301BodyOnTarget.set(null);

client.prepare(QUERY, "http://127.0.0.1:" + portA + "/redirect-query-301-to-b")
.setHeader("Authorization", "Bearer secret-token")
.setHeader("Cookie", "session=secret-session")
.setHeader("Content-Type", "application/query")
.setBody("sensitive-query")
.execute()
.get(5, TimeUnit.SECONDS);

assertNull(query301AuthOnTarget.get(),
"Authorization must be stripped on a cross-origin QUERY redirect");
assertNull(query301CookieOnTarget.get(),
"Cookie must be stripped on a cross-origin QUERY redirect");
assertEquals(QUERY, query301MethodOnTarget.get());
assertEquals("application/query", query301ContentTypeOnTarget.get());
assertEquals("sensitive-query", query301BodyOnTarget.get());

@hyperxpro hyperxpro Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This locks in the cross origin body replay I asked about in the interceptor. If we keep it that is fine, but I would rather decide that first than have a test assert it.

@mkurz mkurz Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. The test is intended to make the selected policy explicit, not decide it implicitly. If we retain AHC’s existing cross-origin keep-body policy, it should remain because it verifies both request preservation and credential stripping. If you prefer the uniform configuration discussed in the interceptor thread to be added here, I will update the implementation and this test together.

}
}

/**
* Cross-domain redirect (different port) must strip a user-supplied Cookie header.
* Regression test for GHSA-fmxf-pm6p-7xgm.
Expand Down
Loading