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

OperatorMatches flags misguided evaluation attempts as FLAWED_PATTERN

Browse Source 
Issue: SPR-16731

(cherry picked from commit d4a55a2)
This commit is contained in:
Juergen Hoeller
2018-04-17 11:10:15 +02:00
parent 246a6db1ca
commit 6a727e1ed7
4 changed files with 94 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@@ -194,6 +194,22 @@ public class EvaluationTests extends AbstractExpressionTests {
evaluate("27 matches '^.*2.*$'", true, Boolean.class); // conversion int>string
}
@Test // SPR-16731
public void testMatchesWithPatternAccessThreshold() {
String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches \'" + pattern + "\'";
Expression expr = parser.parseExpression(expression);
try {
expr.getValue();
fail("Should have exceeded threshold");
}
catch (EvaluationException ee) {
SpelEvaluationException see = (SpelEvaluationException) ee;
assertEquals(SpelMessage.FLAWED_PATTERN, see.getMessageCode());
assertTrue(see.getCause() instanceof IllegalStateException);
}
}
// mixing operators
@Test
public void testMixingOperators01() {