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

UrlPathHelper.removeJsessionid correctly appends remainder 

Closes gh-26079
This commit is contained in:
Rossen Stoyanchev 2020-11-12 21:28:18 +00:00
parent 42d3bc47c9
commit 204a7fe91f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,7 @@ public class UrlPathHelper {
return requestUri; return requestUri;
} }
String start = requestUri.substring(0, index); String start = requestUri.substring(0, index);
for (int i = key.length(); i < requestUri.length(); i++) { for (int i = index + key.length(); i < requestUri.length(); i++) {
char c = requestUri.charAt(i); char c = requestUri.charAt(i);
if (c == ';' || c == '/') { if (c == ';' || c == '/') {
return start + requestUri.substring(i); return start + requestUri.substring(i);

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

@ -128,11 +128,19 @@ public class UrlPathHelperTests {
public void getRequestKeepSemicolonContent() { public void getRequestKeepSemicolonContent() {
helper.setRemoveSemicolonContent(false); helper.setRemoveSemicolonContent(false);
request.setRequestURI("/foo;a=b;c=d"); testKeepSemicolonContent("/foo;a=b;c=d", "/foo;a=b;c=d");
assertThat(helper.getRequestUri(request)).isEqualTo("/foo;a=b;c=d"); testKeepSemicolonContent("/test;jsessionid=1234", "/test");
testKeepSemicolonContent("/test;JSESSIONID=1234", "/test");
testKeepSemicolonContent("/test;jsessionid=1234;a=b", "/test;a=b");
testKeepSemicolonContent("/test;a=b;jsessionid=1234;c=d", "/test;a=b;c=d");
testKeepSemicolonContent("/test;jsessionid=1234/anotherTest", "/test/anotherTest");
testKeepSemicolonContent("/test;jsessionid=;a=b", "/test;a=b");
testKeepSemicolonContent("/somethingLongerThan12;jsessionid=1234", "/somethingLongerThan12");
}
request.setRequestURI("/foo;jsessionid=c0o7fszeb1"); private void testKeepSemicolonContent(String requestUri, String expectedPath) {
assertThat(helper.getRequestUri(request)).isEqualTo("/foo"); request.setRequestURI(requestUri);
assertThat(helper.getRequestUri(request)).isEqualTo(expectedPath);
} }
@Test @Test