root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Normalize 2+ '/' in path in UriComponentsBuilder 

Issue: SPR-12398
This commit is contained in:
Rossen Stoyanchev 2014-10-30 14:49:20 -04:00
parent e9f53c6ddf
commit d8941ca098
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
View File

@ -720,7 +720,14 @@ public class UriComponentsBuilder {
if (this.path.length() == 0) { if (this.path.length() == 0) {
return null; return null;
} }
String path = this.path.toString().replace("//", "/"); String path = this.path.toString();
while (true) {
int index = path.indexOf("//");
if (index == -1) {
break;
}
path = path.substring(0, index) + path.substring(index + 1);
}
return new HierarchicalUriComponents.FullPathComponent(path); return new HierarchicalUriComponents.FullPathComponent(path);
} }

8
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@ -291,6 +291,14 @@ public class UriComponentsBuilderTests {
assertEquals(Arrays.asList("foo", "bar"), result.getPathSegments()); assertEquals(Arrays.asList("foo", "bar"), result.getPathSegments());
} }
// SPR-12398
@Test
public void pathWithDuplicateSlashes() throws URISyntaxException {
UriComponents uriComponents = UriComponentsBuilder.fromPath("/foo/////////bar").build();
assertEquals("/foo/bar", uriComponents.getPath());
}
@Test @Test
public void replacePath() { public void replacePath() {
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt"); UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt");