root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

AntPathMatcher allows newline in URI template variables 

Closes gh-23252
This commit is contained in:
Rossen Stoyanchev 2020-11-12 22:00:47 +00:00
parent 204a7fe91f
commit b92d249f45
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@ -644,7 +644,7 @@ public class AntPathMatcher implements PathMatcher {
private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?}|[^/{}]|\\\\[{}])+?)}"); private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?}|[^/{}]|\\\\[{}])+?)}");
private static final String DEFAULT_VARIABLE_PATTERN = "(.*)"; private static final String DEFAULT_VARIABLE_PATTERN = "((?s).*)";
private final String rawPattern; private final String rawPattern;

1
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@ -130,6 +130,7 @@ class AntPathMatcherTests {
assertThat(pathMatcher.match("", "")).isTrue(); assertThat(pathMatcher.match("", "")).isTrue();
assertThat(pathMatcher.match("/{bla}.*", "/testing.html")).isTrue(); assertThat(pathMatcher.match("/{bla}.*", "/testing.html")).isTrue();
assertThat(pathMatcher.match("/{bla}", "//x\ny")).isTrue();
} }
@Test @Test