Skip to content

Normalize JAR entry paths to strip BOOT-INF/classes prefix in Spring-Boot fat JARs #35619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Normalize JAR entry paths to strip BOOT-INF/classes prefix in Spring-Boot fat JARs #35619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions ...rc/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,8 @@ protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource,
Set<Resource> result = new LinkedHashSet<>(64);
// Clean root entry path to match jar entries format without "!" separators
rootEntryPath = rootEntryPath.replace(ResourceUtils.JAR_URL_SEPARATOR, "/");
// Normalize to match cached entries (which have already been normalized)
rootEntryPath = normalizeJarEntryPath(rootEntryPath);
// Search sorted entries from first entry with rootEntryPath prefix
boolean rootEntryPathFound = false;
for (String entryPath : entriesCache.tailSet(rootEntryPath, false)) {
Expand Down Expand Up @@ -936,11 +938,7 @@ protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource,
NavigableSet<String> entriesCache = new TreeSet<>();
Iterator<String> entryIterator = jarFile.stream().map(JarEntry::getName).sorted().iterator();
while (entryIterator.hasNext()) {
String entryPath = entryIterator.next();
int entrySeparatorIndex = entryPath.indexOf(ResourceUtils.JAR_URL_SEPARATOR);
if (entrySeparatorIndex >= 0) {
entryPath = entryPath.substring(entrySeparatorIndex + ResourceUtils.JAR_URL_SEPARATOR.length());
}
String entryPath = normalizeJarEntryPath(entryIterator.next());
entriesCache.add(entryPath);
if (entryPath.startsWith(rootEntryPath)) {
String relativePath = entryPath.substring(rootEntryPath.length());
Expand Down Expand Up @@ -980,6 +978,26 @@ protected JarFile getJarFile(String jarFileUrl) throws IOException {
}
}

/**
* Normalize a JAR entry path by stripping any prefixes that may prevent proper matching.
* <p>This handles nested JAR separators and Spring Boot fat JAR structure where classes
* are stored under {@code BOOT-INF/classes/}.
* @param entryPath the raw JAR entry path to normalize
* @return the normalized entry path suitable for pattern matching
*/
private String normalizeJarEntryPath(String entryPath) {
// Strip nested JAR separator if present
int entrySeparatorIndex = entryPath.indexOf(ResourceUtils.JAR_URL_SEPARATOR);
if (entrySeparatorIndex >= 0) {
entryPath = entryPath.substring(entrySeparatorIndex + ResourceUtils.JAR_URL_SEPARATOR.length());
}
// Strip Spring Boot fat JAR prefix (BOOT-INF/classes/)
if (entryPath.startsWith("BOOT-INF/classes/")) {
entryPath = entryPath.substring("BOOT-INF/classes/".length());
}
return entryPath;
}

/**
* Find all resources in the file system of the supplied root directory that
* match the given location sub pattern via the Ant-style {@link #getPathMatcher()
Expand Down