Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments

This commit is contained in:
Oleg Kalnichevski 2019-06-21 17:35:55 +02:00
parent 07a9714f3b
commit 8603a61b55
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java
View File

@ -28,6 +28,8 @@ package org.apache.hc.client5.http.utils;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Stack;
@ -83,20 +85,19 @@ public class URIUtils {
if (dropFragment) {
uribuilder.setFragment(null);
}
final String path = uribuilder.getPath();
if (TextUtils.isEmpty(path)) {
uribuilder.setPath("/");
} else {
final StringBuilder buf = new StringBuilder(path.length());
boolean foundSlash = false;
for (int i = 0; i < path.length(); i++) {
final char ch = path.charAt(i);
if (ch != '/' || !foundSlash) {
buf.append(ch);
}
foundSlash = ch == '/';
final List<String> originalPathSegments = uribuilder.getPathSegments();
final List<String> pathSegments = new ArrayList<>(originalPathSegments);
for (final Iterator<String> it = pathSegments.iterator(); it.hasNext(); ) {
final String pathSegment = it.next();
if (pathSegment.isEmpty() && it.hasNext()) {
it.remove();
}
uribuilder.setPath(buf.toString());
}
if (pathSegments.size() != originalPathSegments.size()) {
uribuilder.setPathSegments(pathSegments);
}
if (pathSegments.isEmpty()) {
uribuilder.setPathSegments("");
}
return uribuilder.build();
}

2
httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java
View File

@ -78,6 +78,8 @@ public class TestURIUtils {
Assert.assertEquals("http://thishost/Fragment_identifier%23Examples",
URIUtils.rewriteURI(
URI.create("http://thishost/Fragment_identifier%23Examples")).toString());
Assert.assertEquals("http://thathost/foo%3Abar", URIUtils.rewriteURI(
URI.create("http://thishost/foo%3Abar"), target).toString());
}
@Test