Support Location header with raw query, close AsyncHttpClient#268

Author: Stephane Landelle

api/src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -13,13 +13,15 @@
 package com.ning.http.util;
 
 import static com.ning.http.util.DateUtil.millisTime;
+
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -49,6 +51,7 @@
  * The cookies's handling code is from the Netty framework.
  */
 public class AsyncHttpProviderUtils {
+    
     private final static byte[] NO_BYTES = new byte[0];
 
     public final static String DEFAULT_CHARSET = "ISO-8859-1";
@@ -280,19 +283,48 @@ public final static String getHost(URI uri) {
     public final static URI getRedirectUri(URI uri, String location) {
         if(location == null)
             throw new IllegalArgumentException("URI " + uri + " was redirected to null location");
-        URI newUri = uri.resolve(location);
+        
+        URI locationURI = null;
+        try {
+            locationURI = new URI(location);
+        } catch (URISyntaxException e) {
+            // rich, we have a badly encoded location, let's try to encode the query params
+            String[] parts = location.split("\\?");
+            if (parts.length != 2) {
+                throw new IllegalArgumentException("Don't know how to turn this location into a proper URI:" + location, e);
+            } else {
+                StringBuilder properUrl = new StringBuilder(location.length()).append(parts[0]).append("?");
+                
+                String[] queryParams = parts[1].split("&");
+                for (int i = 0; i < queryParams.length; i++) {
+                    String queryParam = queryParams[i];
+                    if (i != 0)
+                        properUrl.append("&");
+                    String[] nameValue = queryParam.split("=", 2);
+                    UTF8UrlEncoder.appendEncoded(properUrl, nameValue[0]);
+                    if (nameValue.length == 2) {
+                        properUrl.append("=");
+                        UTF8UrlEncoder.appendEncoded(properUrl, nameValue[1]);
+                    }
+                }
+                
+                locationURI = URI.create(properUrl.toString());
+            }
+        }
+        
+        URI redirectUri = uri.resolve(locationURI);
 
-        String scheme = newUri.getScheme();
+        String scheme = redirectUri.getScheme();
 
         if (scheme == null || !scheme.equalsIgnoreCase("http")
                 && !scheme.equalsIgnoreCase("https")
                 && !scheme.equals("ws")
                 && !scheme.equals("wss")) {
-            throw new IllegalArgumentException("The URI scheme, of the URI " + newUri
+            throw new IllegalArgumentException("The URI scheme, of the URI " + redirectUri
                     + ", must be equal (ignoring case) to 'ws, 'wss', 'http', or 'https'");
         }
 
-        return newUri;
+        return redirectUri;
     }
 
     public final static int getPort(URI uri) {

api/src/test/java/com/ning/http/util/AsyncHttpProviderUtilsTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010-2012 Sonatype, Inc. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package com.ning.http.util;
+
+import java.net.URI;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class AsyncHttpProviderUtilsTest {
+
+    @Test(groups = "fast")
+    public void getRedirectUriShouldHandleProperlyEncodedLocation() {
+
+        String url = "http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC%20Lifebook%20E8310%20Core2Duo%20T8100%202%201GHz%204GB%20DVD%20RW&_itemId=150731406505";
+        URI uri = AsyncHttpProviderUtils.getRedirectUri(URI.create("http://www.ebay.de"), url);
+        Assert.assertEquals("http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC%20Lifebook%20E8310%20Core2Duo%20T8100%202%201GHz%204GB%20DVD%20RW&_itemId=150731406505", uri.toString());
+    }
+
+    @Test(groups = "fast")
+    public void getRedirectUriShouldHandleRawQueryParamsLocation() {
+
+        String url = "http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC Lifebook E8310 Core2Duo T8100 2 1GHz 4GB DVD RW&_itemId=150731406505";
+        URI uri = AsyncHttpProviderUtils.getRedirectUri(URI.create("http://www.ebay.de"), url);
+        Assert.assertEquals("http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC%20Lifebook%20E8310%20Core2Duo%20T8100%202%201GHz%204GB%20DVD%20RW&_itemId=150731406505", uri.toString());
+    }
+    
+    @Test(groups = "fast")
+    public void getRedirectUriShouldHandleRelativeLocation() {
+
+        String url = "/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC Lifebook E8310 Core2Duo T8100 2 1GHz 4GB DVD RW&_itemId=150731406505";
+        URI uri = AsyncHttpProviderUtils.getRedirectUri(URI.create("http://www.ebay.de"), url);
+        Assert.assertEquals("http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC%20Lifebook%20E8310%20Core2Duo%20T8100%202%201GHz%204GB%20DVD%20RW&_itemId=150731406505", uri.toString());
+    }
+}