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

Fix issue with extracting matrix variables

Browse Source 
The servlet spec recommends removing path parameters from the
contextPath, servletPath, and pathInfo but not from the requestURI.
This poses a challenge for the UrlPathHelper, which determines the
lookup path by comparing the above.

This change introduces a method that matches the requestURI to the
contextPath and servletPath ignoring path parameters (i.e. matrix
variables) for comparison purposes while also preserving them in the
resulting lookup path.
This commit is contained in:
Rossen Stoyanchev
2012-10-29 19:09:00 -04:00
parent 826057bcde
commit d8469d118b
3 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,15 @@ public class UrlPathHelperTests {
assertEquals("Incorrect path returned", "/welcome.html", helper.getPathWithinApplication(request));
}
@Test
public void getPathWithinServlet() {
request.setContextPath("/petclinic");
request.setServletPath("/main");
request.setRequestURI("/petclinic/main/welcome.html");
assertEquals("Incorrect path returned", "/welcome.html", helper.getPathWithinServletMapping(request));
}
@Test
public void getRequestUri() {
request.setRequestURI("/welcome.html");
@@ -104,6 +113,29 @@ public class UrlPathHelperTests {
assertEquals("jsessionid should always be removed", "/foo;a=b;c=d", helper.getRequestUri(request));
}
@Test
public void getLookupPathWithSemicolonContent() {
helper.setRemoveSemicolonContent(false);
request.setContextPath("/petclinic");
request.setServletPath("/main");
request.setRequestURI("/petclinic;a=b/main;b=c/welcome.html;c=d");
assertEquals("/welcome.html;c=d", helper.getLookupPathForRequest(request));
}
@Test
public void getLookupPathWithSemicolonContentAndNullPathInfo() {
helper.setRemoveSemicolonContent(false);
request.setContextPath("/petclinic");
request.setServletPath("/welcome.html");
request.setRequestURI("/petclinic;a=b/welcome.html;c=d");
assertEquals("/welcome.html;c=d", helper.getLookupPathForRequest(request));
}
//
// suite of tests root requests for default servlets (SRV 11.2) on Websphere vs Tomcat and other containers
// see: http://jira.springframework.org/browse/SPR-7064