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

Merge branch '2.1.x' into 2.2.x 

Closes gh-21320
This commit is contained in:
Phillip Webb 2020-05-05 12:10:51 -07:00
parent 487329fafa df70c42f98
commit 98d27db767
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java
View File

@ -25,6 +25,7 @@ import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.net.URLConnection; import java.net.URLConnection;
import java.nio.file.InvalidPathException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.jar.JarFile; import java.util.jar.JarFile;
@ -124,7 +125,7 @@ class StaticResourceJars {
try { try {
return isResourcesJar(new JarFile(file)); return isResourcesJar(new JarFile(file));
} }
catch (IOException ex) { catch (IOException | InvalidPathException ex) {
return false; return false;
} }
} }

9
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/StaticResourceJarsTests.java
View File

@ -77,6 +77,15 @@ class StaticResourceJarsTests {
assertThat(staticResourceJarUrls).hasSize(1); assertThat(staticResourceJarUrls).hasSize(1);
} }
@Test
void ignoreWildcardUrls() throws Exception {
File jarFile = createResourcesJar("test-resources.jar");
URL folderUrl = jarFile.getParentFile().toURI().toURL();
URL wildcardUrl = new URL(folderUrl.toString() + "*.jar");
List<URL> staticResourceJarUrls = new StaticResourceJars().getUrlsFrom(wildcardUrl);
assertThat(staticResourceJarUrls).isEmpty();
}
private File createResourcesJar(String name) throws IOException { private File createResourcesJar(String name) throws IOException {
return createJar(name, (output) -> { return createJar(name, (output) -> {
JarEntry jarEntry = new JarEntry("META-INF/resources"); JarEntry jarEntry = new JarEntry("META-INF/resources");