Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-10-31 06:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable AntPathRequestMatcher trim tokens

Browse Source 
Issue gh-3831
This commit is contained in:
Rob Winch 2016-04-19 15:21:56 -05:00
parent 510cd59980
commit 6fa1588de9
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
View File

@ -253,7 +253,7 @@ public final class AntPathRequestMatcher implements RequestMatcher {
}
private static class SpringAntMatcher implements Matcher {
private static final AntPathMatcher antMatcher = new AntPathMatcher();
private static final AntPathMatcher antMatcher = createMatcher();
private final String pattern;
@ -270,6 +270,12 @@ public final class AntPathRequestMatcher implements RequestMatcher {
public Map<String, String> extractUriTemplateVariables(String path) {
return antMatcher.extractUriTemplateVariables(this.pattern, path);
}
private static AntPathMatcher createMatcher() {
AntPathMatcher matcher = new AntPathMatcher();
matcher.setTrimTokens(false);
return matcher;
}
}
/**

11
web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
View File

@ -162,6 +162,17 @@ public class AntPathRequestMatcherTests {
.isTrue();
}
@Test
public void spacesInPathSegmentsAreNotIgnored() {
AntPathRequestMatcher matcher = new AntPathRequestMatcher("/path/*/bar");
MockHttpServletRequest request = createRequest("/path /foo/bar");
assertThat(matcher.matches(request)).isFalse();
matcher = new AntPathRequestMatcher("/path/foo");
request = createRequest("/path /foo");
assertThat(matcher.matches(request)).isFalse();
}
@Test
public void equalsBehavesCorrectly() throws Exception {
// Both universal wildcard options should be equal