Skip to content

Commit

Permalink
Change max regex length in SpEL expressions to 1000
Browse files Browse the repository at this point in the history
This commit changes the max regex length in SpEL expressions from 1024
to 1000 in order to consistently use "round" numbers for recently
introduced limits.

See gh-30265
  • Loading branch information
sbrannen authored and bclozel committed Apr 13, 2023
1 parent 8bb1b3e commit be129dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class OperatorMatches extends Operator {
* Maximum number of characters permitted in a regular expression.
* @since 5.2.23
*/
private static final int MAX_REGEX_LENGTH = 1024;
private static final int MAX_REGEX_LENGTH = 1000;

private final ConcurrentMap<String, Pattern> patternCache;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,13 @@ void matchesWithPatternAccessThreshold() {

@Test
void matchesWithPatternLengthThreshold() {
String pattern = String.format("(%s|X)", repeat("1234", 255));
assertThat(pattern).hasSize(1024);
String pattern = String.format("^(%s|X)", repeat("12345", 199));
assertThat(pattern).hasSize(1000);
Expression expr = parser.parseExpression("'X' matches '" + pattern + "'");
assertThat(expr.getValue(context, Boolean.class)).isTrue();

pattern += "?";
assertThat(pattern).hasSize(1025);
assertThat(pattern).hasSize(1001);
evaluateAndCheckError("'abc' matches '" + pattern + "'", Boolean.class, SpelMessage.MAX_REGEX_LENGTH_EXCEEDED);
}

Expand Down

0 comments on commit be129dc

Please sign in to comment.