Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UrlPathHelper.removeJsessionid correctly appends remainder

Browse Source 
Closes gh-26079
This commit is contained in:
Rossen Stoyanchev
2020-11-12 21:28:18 +00:00
parent dc8a776cae
commit 08bb796c8c
2 changed files with 13 additions and 5 deletions
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

@@ -544,7 +544,7 @@ public class UrlPathHelper {
return requestUri;
}
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);
if (c == ';' || c == '/') {
return start + requestUri.substring(i);

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

@@ -129,11 +129,19 @@ public class UrlPathHelperTests {
public void getRequestKeepSemicolonContent() {
helper.setRemoveSemicolonContent(false);
request.setRequestURI("/foo;a=b;c=d");
assertEquals("/foo;a=b;c=d", helper.getRequestUri(request));
testKeepSemicolonContent("/foo;a=b;c=d", "/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");
assertEquals("/foo", helper.getRequestUri(request));
private void testKeepSemicolonContent(String requestUri, String expectedPath) {
request.setRequestURI(requestUri);
assertEquals(expectedPath, helper.getRequestUri(request));
}
@Test