Browse Source

Fix IndexOutOfBoundsException exception from parseUrl with empty spec

Update jar `Handler` code so that the `parseUrl` method can accept an
empty `spec`. Prior to this commit, a `classLoader.getResource("")`
call would result in a `null` result. This breaks a number of things
including `ClassPathResource` and `PathMatchingResourcePatternResolver`.

Fixes gh-38524
pull/38550/head
Phillip Webb 2 years ago
parent
commit
0856e10443
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/Handler.java
  2. 9
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/HandlerTests.java

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/Handler.java

@ -89,7 +89,7 @@ public class Handler extends URLStreamHandler { @@ -89,7 +89,7 @@ public class Handler extends URLStreamHandler {
private String extractContextPath(URL url, String spec, int start) {
String contextPath = url.getPath();
if (spec.charAt(start) == '/') {
if (spec.regionMatches(false, start, "/", 0, 1)) {
int indexOfContextPathSeparator = indexOfSeparator(contextPath);
if (indexOfContextPathSeparator == -1) {
throw new IllegalStateException("malformed context url:%s: no !/".formatted(url));

9
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/HandlerTests.java

@ -142,6 +142,15 @@ class HandlerTests { @@ -142,6 +142,15 @@ class HandlerTests {
assertThat(url.toExternalForm()).isEqualTo("jar:file:example.jar!/entry.txt#runtime");
}
@Test // gh-38524
void parseUrlWhenSpecIsEmpty() throws MalformedURLException {
URL url = createJarUrl("nested:gh-38524.jar/!BOOT-INF/classes/!/");
String spec = "";
this.handler.parseURL(url, spec, 0, 0);
assertThat(url.toExternalForm()).isEqualTo("jar:nested:gh-38524.jar/!BOOT-INF/classes/!/");
}
@Test
void hashCodeGeneratesHashCode() throws MalformedURLException {
URL url = createJarUrl("file:example.jar!/entry.txt");

Loading…
Cancel
Save