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

Merge branch '2.5.x' 

Closes gh-28033
This commit is contained in:
Andy Wilkinson 2021-09-16 09:56:26 +01:00
parent 89815b8b6f afb81f14ea
commit 69e793ab37
2 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/JarResourceManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,6 +18,7 @@ package org.springframework.boot.web.embedded.undertow;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import io.undertow.UndertowMessages;
@ -39,16 +40,17 @@ class JarResourceManager implements ResourceManager {
private final String jarPath;
JarResourceManager(File jarFile) {
this(jarFile.getAbsolutePath());
}
JarResourceManager(String jarPath) {
this.jarPath = jarPath;
try {
this.jarPath = jarFile.getAbsoluteFile().toURI().toURL().toString();
}
catch (MalformedURLException ex) {
throw new IllegalArgumentException(ex);
}
}
@Override
public Resource getResource(String path) throws IOException {
URL url = new URL("jar:file:" + this.jarPath + "!" + (path.startsWith("/") ? path : "/" + path));
URL url = new URL("jar:" + this.jarPath + "!" + (path.startsWith("/") ? path : "/" + path));
URLResource resource = new URLResource(url, path);
if (StringUtils.hasText(path) && !"/".equals(path) && resource.getContentLength() < 0) {
return null;

89
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/JarResourceManagerTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,14 +19,23 @@ package org.springframework.boot.web.embedded.undertow;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Arrays;
import java.util.List;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import io.undertow.server.handlers.resource.Resource;
import io.undertow.server.handlers.resource.ResourceManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.util.FileCopyUtils;
import static org.assertj.core.api.Assertions.assertThat;
@ -37,46 +46,58 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
class JarResourceManagerTests {
private ResourceManager resourceManager;
@TempDir
static File tempDir;
@BeforeEach
void createJar(@TempDir File tempDir) throws IOException {
@ResourceManagersTest
void emptyPathIsHandledCorrectly(String filename, ResourceManager resourceManager) throws IOException {
Resource resource = resourceManager.getResource("");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isTrue();
}
@ResourceManagersTest
void rootPathIsHandledCorrectly(String filename, ResourceManager resourceManager) throws IOException {
Resource resource = resourceManager.getResource("/");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isTrue();
}
@ResourceManagersTest
void resourceIsFoundInJarFile(String filename, ResourceManager resourceManager) throws IOException {
Resource resource = resourceManager.getResource("/hello.txt");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isFalse();
assertThat(resource.getContentLength()).isEqualTo(5);
}
@ResourceManagersTest
void resourceIsFoundInJarFileWithoutLeadingSlash(String filename, ResourceManager resourceManager)
throws IOException {
Resource resource = resourceManager.getResource("hello.txt");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isFalse();
assertThat(resource.getContentLength()).isEqualTo(5);
}
static List<Arguments> resourceManagers() throws IOException {
File jar = new File(tempDir, "test.jar");
try (JarOutputStream out = new JarOutputStream(new FileOutputStream(jar))) {
out.putNextEntry(new ZipEntry("hello.txt"));
out.write("hello".getBytes());
}
this.resourceManager = new JarResourceManager(jar);
File troublesomeNameJar = new File(tempDir, "test##1.0.jar");
FileCopyUtils.copy(jar, troublesomeNameJar);
return Arrays.asList(Arguments.of(jar.getName(), new JarResourceManager(jar)),
Arguments.of(troublesomeNameJar.getName(), new JarResourceManager(troublesomeNameJar)));
}
@Test
void emptyPathIsHandledCorrectly() throws IOException {
Resource resource = this.resourceManager.getResource("");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isTrue();
}
@ParameterizedTest(name = "[{index}] {0}")
@MethodSource("resourceManagers")
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
private @interface ResourceManagersTest {
@Test
void rootPathIsHandledCorrectly() throws IOException {
Resource resource = this.resourceManager.getResource("/");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isTrue();
}
@Test
void resourceIsFoundInJarFile() throws IOException {
Resource resource = this.resourceManager.getResource("/hello.txt");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isFalse();
assertThat(resource.getContentLength()).isEqualTo(5);
}
@Test
void resourceIsFoundInJarFileWithoutLeadingSlash() throws IOException {
Resource resource = this.resourceManager.getResource("hello.txt");
assertThat(resource).isNotNull();
assertThat(resource.isDirectory()).isFalse();
assertThat(resource.getContentLength()).isEqualTo(5);
}
}