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

Revert "Improve suffix pattern check" 

This reverts commit 3474afb165.

Unfortunately this change is likely to cause issues for applications
that use regular expressions in a URI variable. I think we will have
to leave at: if there are any dots in the last segment of the
request path, regardless of whether they're in a URI var or not,
the suffix pattern match is off.

Issue: SPR-11532
This commit is contained in:
Rossen Stoyanchev 2014-03-26 11:37:11 -04:00
parent 3347b45292
commit e92bbc8014
2 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
View File

@ -249,7 +249,8 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
}
}
else {
if (!hasSuffix(pattern) && this.pathMatcher.match(pattern + ".*", lookupPath)) {
boolean hasSuffix = pattern.indexOf('.') != -1;
if (!hasSuffix && this.pathMatcher.match(pattern + ".*", lookupPath)) {
return pattern + ".*";
}
}
@ -265,28 +266,6 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
return null;
}
private boolean hasSuffix(String pattern) {
boolean uriVarMode = false;
for (int i = pattern.length(); i > 0; i--) {
char c = pattern.charAt(i-1);
if (c == '}') {
uriVarMode = true;
}
else if (c == '{') {
uriVarMode = false;
}
else if (c == '/') {
return false;
}
else {
if (!uriVarMode && c == '.') {
return true;
}
}
}
return false;
}
/**
* Compare the two conditions based on the URL patterns they contain.
* Patterns are compared one at a time, from top to bottom via

22
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -115,26 +115,6 @@ public class PatternsRequestConditionTests {
assertEquals("/{foo}", match.getPatterns().iterator().next());
}
// SPR-11532
@Test
public void matchSuffixPatternWithUriVariables() {
testSuffixPattern("/employees/{areaOfResponsibility.owner.id}", "/employees/976685.json", false);
testSuffixPattern("/establishments/{establishmentId}", "/establishments/123456789.json", false);
testSuffixPattern("/a.b/c", "/a.b/c.json", false);
testSuffixPattern("/a/b.json", "/a/b.json", true);
testSuffixPattern("/a/{b}.{c}", "/a/b.c", true);
}
public void testSuffixPattern(String pattern, String url, boolean patternHasSuffix) {
MockHttpServletRequest request = new MockHttpServletRequest("GET", url);
PatternsRequestCondition condition = new PatternsRequestCondition(pattern);
PatternsRequestCondition match = condition.getMatchingCondition(request);
assertNotNull(match);
assertEquals((patternHasSuffix ? pattern : pattern + ".*"), match.getPatterns().iterator().next());
}
// SPR-8410
@Test