Merge pull request AsyncHttpClient#1045 from rodrigosetti/redirect-post-keep-content-type

Keep Content-Type when redirecting POST request with body

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/handler/Protocol.java

@@ -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)//
@@ -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
@@ -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);
 

client/src/test/java/org/asynchttpclient/RedirectBodyTest.java

@@ -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;
@@ -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() {
@@ -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();
@@ -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);
         }
     }
 }