HTTPCLIENT-1803: Improved handling of malformed paths by URIBuilder

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1779735 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 21, 2017 · 0554271 · 0554271
1 parent 6e47598
commit 0554271
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
@@ -493,7 +493,7 @@ public String toString() {
     private static String normalizePath(final String path) {
         String s = path;
         if (s == null) {
-            return null;
+            return "/";
         }
         int n = 0;
         for (; n < s.length(); n++) {
@@ -504,6 +504,9 @@ private static String normalizePath(final String path) {
         if (n > 1) {
             s = s.substring(n - 1);
         }
+        if (!s.startsWith("/")) {
+            s = "/" + s;
+        }
         return s;
     }
 

diff --git a/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java b/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
@@ -292,4 +292,11 @@ private List<NameValuePair> createParameters() {
         return parameters;
     }
 
+    @Test
+    public void testMalformedPath() throws Exception {
+        final String path = "@notexample.com/mypath";
+        final URI uri = new URIBuilder(path).setHost("example.com").build();
+        Assert.assertEquals("example.com", uri.getHost());
+    }
+
 }