Skip to content

Commit

Permalink
AntRegexRequestMatcher Optimization
Browse files Browse the repository at this point in the history
Closes gh-11234
  • Loading branch information
rwinch committed May 16, 2022
1 parent af95be3 commit 7086395
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
*/
public final class RegexRequestMatcher implements RequestMatcher {

private static final int DEFAULT = 0;
private static final int DEFAULT = Pattern.DOTALL;

private static final int CASE_INSENSITIVE = DEFAULT | Pattern.CASE_INSENSITIVE;

private static final Log logger = LogFactory.getLog(RegexRequestMatcher.class);

Expand All @@ -68,7 +70,7 @@ public RegexRequestMatcher(String pattern, String httpMethod) {
* {@link Pattern#CASE_INSENSITIVE} flag set.
*/
public RegexRequestMatcher(String pattern, String httpMethod, boolean caseInsensitive) {
this.pattern = Pattern.compile(pattern, caseInsensitive ? Pattern.CASE_INSENSITIVE : DEFAULT);
this.pattern = Pattern.compile(pattern, caseInsensitive ? CASE_INSENSITIVE : DEFAULT);
this.httpMethod = StringUtils.hasText(httpMethod) ? HttpMethod.valueOf(httpMethod) : null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ public void matchesWithInvalidMethod() {
assertThat(matcher.matches(request)).isFalse();
}

@Test
public void matchesWithCarriageReturn() {
RegexRequestMatcher matcher = new RegexRequestMatcher(".*", null);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/blah%0a");
request.setServletPath("/blah\n");
assertThat(matcher.matches(request)).isTrue();
}

@Test
public void matchesWithLineFeed() {
RegexRequestMatcher matcher = new RegexRequestMatcher(".*", null);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/blah%0d");
request.setServletPath("/blah\r");
assertThat(matcher.matches(request)).isTrue();
}

@Test
public void toStringThenFormatted() {
RegexRequestMatcher matcher = new RegexRequestMatcher("/blah", "GET");
Expand Down

0 comments on commit 7086395

Please sign in to comment.