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

Avoid pattern misdetection in Tomcat "war:" URL separator

Browse Source 
Issue: SPR-15332
This commit is contained in:
Juergen Hoeller
2017-03-16 18:55:49 +01:00
parent f6e2c585c8
commit 012c56a1f0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@@ -284,9 +284,10 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
} }
} }
else { else {
// Only look for a pattern after a prefix here // Generally only look for a pattern after a prefix here,
// (to not get fooled by a pattern symbol in a strange prefix). // and on Tomcat only after the "*/" separator for its "war:" protocol.
int prefixEnd = locationPattern.indexOf(":") + 1; int prefixEnd = (locationPattern.startsWith("war:") ? locationPattern.indexOf("*/") + 1 :
locationPattern.indexOf(":") + 1);
if (getPathMatcher().isPattern(locationPattern.substring(prefixEnd))) { if (getPathMatcher().isPattern(locationPattern.substring(prefixEnd))) {
// a file pattern // a file pattern
return findPathMatchingResources(locationPattern); return findPathMatchingResources(locationPattern);