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

Polishing contribution 

Closes gh-27623
This commit is contained in:
Rossen Stoyanchev 2021-11-09 09:45:35 +00:00
parent b5743966d6
commit c6ce65ef56
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
View File

@ -405,17 +405,18 @@ public class UrlPathHelper {
* </ul> * </ul>
*/ */
private static String getSanitizedPath(final String path) { private static String getSanitizedPath(final String path) {
if (path.length() == 0) { int start = path.indexOf("//");
if (start == -1) {
return path; return path;
} }
char[] arr = path.toCharArray(); char[] content = path.toCharArray();
int slowIndex = 0; int slowIndex = start;
for (int fastIndex = 1; fastIndex < arr.length; fastIndex++) { for (int fastIndex = start + 1; fastIndex < content.length; fastIndex++) {
if (arr[fastIndex] != '/' || arr[slowIndex] != '/') { if (content[fastIndex] != '/' || content[slowIndex] != '/') {
arr[++slowIndex] = arr[fastIndex]; content[++slowIndex] = content[fastIndex];
} }
} }
return new String(arr, 0, slowIndex + 1); return new String(content, 0, slowIndex + 1);
} }
/** /**

4
spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
View File

@ -232,12 +232,12 @@ class UrlPathHelperTests {
request.setContextPath("/SPR-12372"); request.setContextPath("/SPR-12372");
request.setPathInfo(null); request.setPathInfo(null);
request.setServletPath("/foo/bar/"); request.setServletPath("/foo/bar/");
request.setRequestURI("/SPR-12372/foo//bar/"); request.setRequestURI("/SPR-12372/foo///bar/");
assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/"); assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/");
request.setServletPath("/foo/bar/"); request.setServletPath("/foo/bar/");
request.setRequestURI("/SPR-12372/foo/bar//"); request.setRequestURI("////SPR-12372/foo/bar//");
assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/"); assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/");