Skip to content

Keep Content-Type when redirecting POST request with body #1045

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

Merged
merged 1 commit into from
Nov 23, 2015
Merged

Keep Content-Type when redirecting POST request with body #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions client/src/main/java/org/asynchttpclient/netty/handler/Protocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,15 @@ public Protocol(ChannelManager channelManager, AsyncHttpClientConfig config, Net

public abstract void onClose(NettyResponseFuture<?> future);

private HttpHeaders propagatedHeaders(Request request, Realm realm, boolean switchToGet) {
private HttpHeaders propagatedHeaders(Request request, Realm realm, boolean keepBody) {

HttpHeaders headers = request.getHeaders()//
.remove(HttpHeaders.Names.HOST)//
.remove(HttpHeaders.Names.CONTENT_LENGTH)//
.remove(HttpHeaders.Names.CONTENT_TYPE);
.remove(HttpHeaders.Names.CONTENT_LENGTH);

if (!keepBody) {
headers.remove(HttpHeaders.Names.CONTENT_TYPE);
}

if (realm != null && realm.getScheme() == AuthScheme.NTLM) {
headers.remove(AUTHORIZATION)//
Expand Down Expand Up @@ -142,7 +145,7 @@ else if (request.getBodyGenerator() != null)
requestBuilder.setBody(request.getBodyGenerator());
}

requestBuilder.setHeaders(propagatedHeaders(request, realm, switchToGet));
requestBuilder.setHeaders(propagatedHeaders(request, realm, keepBody));

// in case of a redirect from HTTP to HTTPS, future
// attributes might change
Expand All @@ -161,7 +164,7 @@ else if (request.getBodyGenerator() != null)
requestBuilder.addOrReplaceCookie(c);
}

requestBuilder.setHeaders(propagatedHeaders(future.getCurrentRequest(), realm, switchToGet));
requestBuilder.setHeaders(propagatedHeaders(future.getCurrentRequest(), realm, keepBody));

boolean sameBase = isSameBase(request.getUri(), newUri);

Expand Down
26 changes: 22 additions & 4 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 @@ -2,6 +2,7 @@

import static org.asynchttpclient.Dsl.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;

import java.io.IOException;
import java.util.concurrent.TimeUnit;
Expand All @@ -16,10 +17,18 @@
import org.asynchttpclient.filter.ResponseFilter;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

public class RedirectBodyTest extends AbstractBasicTest {

private String receivedContentType;

@BeforeMethod
public void setUp() throws Exception {
receivedContentType = null;
}

@Override
public AbstractHandler configureHandler() throws Exception {
return new AbstractHandler() {
Expand All @@ -41,6 +50,7 @@ public void handle(String pathInContext, Request request, HttpServletRequest htt
IOUtils.read(request.getInputStream(), buffer);
httpResponse.getOutputStream().write(buffer);
}
receivedContentType = request.getContentType();
}
httpResponse.getOutputStream().flush();
httpResponse.getOutputStream().close();
Expand All @@ -60,39 +70,47 @@ public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException
public void regular301LosesBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true).addResponseFilter(redirectOnce))) {
String body = "hello there";
String contentType = "text/plain";

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

@Test(groups = "standalone")
public void regular302LosesBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true).addResponseFilter(redirectOnce))) {
String body = "hello there";
String contentType = "text/plain";

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

@Test(groups = "standalone")
public void regular302StrictKeepsBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true).setStrict302Handling(true).addResponseFilter(redirectOnce))) {
String body = "hello there";
String contentType = "text/plain";

Response response = c.preparePost(getTargetUrl()).setBody(body).setHeader("X-REDIRECT", "302").execute().get(TIMEOUT, TimeUnit.SECONDS);
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(receivedContentType, contentType);
}
}

@Test(groups = "standalone")
public void regular307KeepsBody() throws Exception {
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true).addResponseFilter(redirectOnce))) {
String body = "hello there";
String contentType = "text/plain";

Response response = c.preparePost(getTargetUrl()).setBody(body).setHeader("X-REDIRECT", "307").execute().get(TIMEOUT, TimeUnit.SECONDS);
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(receivedContentType, contentType);
}
}
}