Skip to content

Commit 2270df5

Browse files
committed
Enforce cleaned URL for root resource from ClassLoader
Closes gh-32828
1 parent 70886e3 commit 2270df5

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,17 @@ protected Resource convertClassLoaderURL(URL url) {
423423
}
424424
}
425425
else {
426+
String urlString = url.toString();
427+
String cleanedPath = StringUtils.cleanPath(urlString);
428+
if (!cleanedPath.equals(urlString)) {
429+
// Prefer cleaned URL, aligned with UrlResource#createRelative(String)
430+
try {
431+
return new UrlResource(ResourceUtils.toURI(cleanedPath));
432+
}
433+
catch (URISyntaxException | MalformedURLException ex) {
434+
// Fallback to regular URL construction below...
435+
}
436+
}
426437
return new UrlResource(url);
427438
}
428439
}

0 commit comments

Comments
 (0)