mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-31395
This commit is contained in:
commit
bcbcc53a09
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -26,8 +26,11 @@ import java.net.URL;
|
|||||||
import java.net.URLStreamHandler;
|
import java.net.URLStreamHandler;
|
||||||
import java.net.URLStreamHandlerFactory;
|
import java.net.URLStreamHandlerFactory;
|
||||||
import java.security.Permission;
|
import java.security.Permission;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Spliterator;
|
import java.util.Spliterator;
|
||||||
import java.util.Spliterators;
|
import java.util.Spliterators;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
@ -93,6 +96,8 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
|
|
||||||
private volatile JarFileWrapper wrapper;
|
private volatile JarFileWrapper wrapper;
|
||||||
|
|
||||||
|
private final List<JarFile> nestedJars = Collections.synchronizedList(new ArrayList<>());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new {@link JarFile} backed by the specified file.
|
* Create a new {@link JarFile} backed by the specified file.
|
||||||
* @param file the root jar file
|
* @param file the root jar file
|
||||||
@ -128,9 +133,6 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccessData data, JarEntryFilter filter,
|
private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccessData data, JarEntryFilter filter,
|
||||||
JarFileType type, Supplier<Manifest> manifestSupplier) throws IOException {
|
JarFileType type, Supplier<Manifest> manifestSupplier) throws IOException {
|
||||||
super(rootFile.getFile());
|
super(rootFile.getFile());
|
||||||
if (System.getSecurityManager() == null) {
|
|
||||||
super.close();
|
|
||||||
}
|
|
||||||
this.rootFile = rootFile;
|
this.rootFile = rootFile;
|
||||||
this.pathFromRoot = pathFromRoot;
|
this.pathFromRoot = pathFromRoot;
|
||||||
CentralDirectoryParser parser = new CentralDirectoryParser();
|
CentralDirectoryParser parser = new CentralDirectoryParser();
|
||||||
@ -142,8 +144,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
}
|
}
|
||||||
catch (RuntimeException ex) {
|
catch (RuntimeException ex) {
|
||||||
try {
|
try {
|
||||||
this.rootFile.close();
|
close();
|
||||||
super.close();
|
|
||||||
}
|
}
|
||||||
catch (IOException ioex) {
|
catch (IOException ioex) {
|
||||||
}
|
}
|
||||||
@ -188,9 +189,14 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
JarFileWrapper getWrapper() throws IOException {
|
JarFileWrapper getWrapper() throws IOException {
|
||||||
JarFileWrapper wrapper = this.wrapper;
|
JarFileWrapper wrapper = this.wrapper;
|
||||||
if (wrapper == null) {
|
if (wrapper == null) {
|
||||||
|
synchronized (this) {
|
||||||
|
if (this.wrapper != null) {
|
||||||
|
return this.wrapper;
|
||||||
|
}
|
||||||
wrapper = new JarFileWrapper(this);
|
wrapper = new JarFileWrapper(this);
|
||||||
this.wrapper = wrapper;
|
this.wrapper = wrapper;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return wrapper;
|
return wrapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -334,8 +340,10 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
+ "mechanism used to create your executable jar file");
|
+ "mechanism used to create your executable jar file");
|
||||||
}
|
}
|
||||||
RandomAccessData entryData = this.entries.getEntryData(entry.getName());
|
RandomAccessData entryData = this.entries.getEntryData(entry.getName());
|
||||||
return new JarFile(this.rootFile, this.pathFromRoot + "!/" + entry.getName(), entryData,
|
JarFile nestedJar = new JarFile(this.rootFile, this.pathFromRoot + "!/" + entry.getName(), entryData,
|
||||||
JarFileType.NESTED_JAR);
|
JarFileType.NESTED_JAR);
|
||||||
|
this.nestedJars.add(nestedJar);
|
||||||
|
return nestedJar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -355,12 +363,20 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
|
|||||||
if (this.closed) {
|
if (this.closed) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
synchronized (this) {
|
||||||
super.close();
|
super.close();
|
||||||
if (this.type == JarFileType.DIRECT) {
|
if (this.type == JarFileType.DIRECT) {
|
||||||
this.rootFile.close();
|
this.rootFile.close();
|
||||||
}
|
}
|
||||||
|
if (this.wrapper != null) {
|
||||||
|
this.wrapper.close();
|
||||||
|
}
|
||||||
|
for (JarFile nestedJar : this.nestedJars) {
|
||||||
|
nestedJar.close();
|
||||||
|
}
|
||||||
this.closed = true;
|
this.closed = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void ensureOpen() {
|
private void ensureOpen() {
|
||||||
if (this.closed) {
|
if (this.closed) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -40,9 +40,6 @@ class JarFileWrapper extends AbstractJarFile {
|
|||||||
JarFileWrapper(JarFile parent) throws IOException {
|
JarFileWrapper(JarFile parent) throws IOException {
|
||||||
super(parent.getRootJarFile().getFile());
|
super(parent.getRootJarFile().getFile());
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
if (System.getSecurityManager() == null) {
|
|
||||||
super.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -18,6 +18,7 @@ package org.springframework.boot.loader.jar;
|
|||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.FilterInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
@ -165,7 +166,7 @@ final class JarURLConnection extends java.net.JarURLConnection {
|
|||||||
if (inputStream == null) {
|
if (inputStream == null) {
|
||||||
throwFileNotFound(this.jarEntryName, this.jarFile);
|
throwFileNotFound(this.jarEntryName, this.jarFile);
|
||||||
}
|
}
|
||||||
return inputStream;
|
return new ConnectionInputStream(inputStream);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void throwFileNotFound(Object entry, AbstractJarFile jarFile) throws FileNotFoundException {
|
private void throwFileNotFound(Object entry, AbstractJarFile jarFile) throws FileNotFoundException {
|
||||||
@ -290,6 +291,19 @@ final class JarURLConnection extends java.net.JarURLConnection {
|
|||||||
return new JarURLConnection(null, jarFile, jarEntryName);
|
return new JarURLConnection(null, jarFile, jarEntryName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class ConnectionInputStream extends FilterInputStream {
|
||||||
|
|
||||||
|
ConnectionInputStream(InputStream in) {
|
||||||
|
super(in);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void close() throws IOException {
|
||||||
|
JarURLConnection.this.jarFile.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A JarEntryName parsed from a URL String.
|
* A JarEntryName parsed from a URL String.
|
||||||
*/
|
*/
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -61,6 +61,7 @@ class JarFileWrapperTests {
|
|||||||
@AfterEach
|
@AfterEach
|
||||||
void cleanup() throws Exception {
|
void cleanup() throws Exception {
|
||||||
this.parent.close();
|
this.parent.close();
|
||||||
|
this.wrapper.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private File createTempJar(File temp) throws IOException {
|
private File createTempJar(File temp) throws IOException {
|
||||||
|
@ -14,6 +14,8 @@ dependencies {
|
|||||||
app project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository")
|
app project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository")
|
||||||
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
|
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
|
||||||
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
|
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
|
||||||
|
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
|
||||||
|
app("org.bouncycastle:bcprov-jdk15on:1.70")
|
||||||
|
|
||||||
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
|
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
|
||||||
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
|
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
|
||||||
@ -39,6 +41,18 @@ task buildApp(type: GradleBuild) {
|
|||||||
tasks = ["build"]
|
tasks = ["build"]
|
||||||
}
|
}
|
||||||
|
|
||||||
intTest {
|
task syncSignedJarUnpackAppSource(type: org.springframework.boot.build.SyncAppSource) {
|
||||||
dependsOn buildApp
|
sourceDirectory = file("spring-boot-loader-tests-signed-jar-unpack-app")
|
||||||
|
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-signed-jar-unpack-app")
|
||||||
|
}
|
||||||
|
|
||||||
|
task buildSignedJarUnpackApp(type: GradleBuild) {
|
||||||
|
dependsOn syncSignedJarUnpackAppSource, syncMavenRepository
|
||||||
|
dir = "${buildDir}/spring-boot-loader-tests-signed-jar-unpack-app"
|
||||||
|
startParameter.buildCacheEnabled = false
|
||||||
|
tasks = ["build"]
|
||||||
|
}
|
||||||
|
|
||||||
|
intTest {
|
||||||
|
dependsOn buildApp, buildSignedJarUnpackApp
|
||||||
}
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
plugins {
|
||||||
|
id "java"
|
||||||
|
id "org.springframework.boot"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply plugin: "io.spring.dependency-management"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
||||||
|
mavenCentral()
|
||||||
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter")
|
||||||
|
implementation("org.bouncycastle:bcprov-jdk15on:1.70")
|
||||||
|
}
|
||||||
|
|
||||||
|
bootJar {
|
||||||
|
requiresUnpack '**/bcprov-jdk15on-*.jar'
|
||||||
|
}
|
@ -0,0 +1,15 @@
|
|||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
||||||
|
mavenCentral()
|
||||||
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
}
|
||||||
|
resolutionStrategy {
|
||||||
|
eachPlugin {
|
||||||
|
if (requested.id.id == "org.springframework.boot") {
|
||||||
|
useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2022 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.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.loaderapp;
|
||||||
|
|
||||||
|
import java.security.Security;
|
||||||
|
import javax.crypto.Cipher;
|
||||||
|
import org.bouncycastle.jce.provider.BouncyCastleProvider;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class LoaderSignedJarTestApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
Security.addProvider(new BouncyCastleProvider());
|
||||||
|
Cipher.getInstance("AES/CBC/PKCS5Padding","BC");
|
||||||
|
System.out.println("Legion of the Bouncy Castle");
|
||||||
|
SpringApplication.run(LoaderSignedJarTestApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -51,7 +51,7 @@ class LoaderIntegrationTests {
|
|||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("javaRuntimes")
|
@MethodSource("javaRuntimes")
|
||||||
void readUrlsWithoutWarning(JavaRuntime javaRuntime) {
|
void readUrlsWithoutWarning(JavaRuntime javaRuntime) {
|
||||||
try (GenericContainer<?> container = createContainer(javaRuntime)) {
|
try (GenericContainer<?> container = createContainer(javaRuntime, "spring-boot-loader-tests-app")) {
|
||||||
container.start();
|
container.start();
|
||||||
System.out.println(this.output.toUtf8String());
|
System.out.println(this.output.toUtf8String());
|
||||||
assertThat(this.output.toUtf8String()).contains(">>>>> 287649 BYTES from").doesNotContain("WARNING:")
|
assertThat(this.output.toUtf8String()).contains(">>>>> 287649 BYTES from").doesNotContain("WARNING:")
|
||||||
@ -59,17 +59,32 @@ class LoaderIntegrationTests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private GenericContainer<?> createContainer(JavaRuntime javaRuntime) {
|
@ParameterizedTest
|
||||||
|
@MethodSource("javaRuntimes")
|
||||||
|
void runSignedJarWhenUnpacked(JavaRuntime javaRuntime) {
|
||||||
|
try (GenericContainer<?> container = createContainer(javaRuntime,
|
||||||
|
"spring-boot-loader-tests-signed-jar-unpack-app")) {
|
||||||
|
container.start();
|
||||||
|
System.out.println(this.output.toUtf8String());
|
||||||
|
assertThat(this.output.toUtf8String()).contains("Legion of the Bouncy Castle");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private GenericContainer<?> createContainer(JavaRuntime javaRuntime, String name) {
|
||||||
return javaRuntime.getContainer().withLogConsumer(this.output)
|
return javaRuntime.getContainer().withLogConsumer(this.output)
|
||||||
.withCopyFileToContainer(MountableFile.forHostPath(findApplication().toPath()), "/app.jar")
|
.withCopyFileToContainer(findApplication(name), "/app.jar")
|
||||||
.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
|
.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
|
||||||
.withCommand("java", "-jar", "app.jar");
|
.withCommand("java", "-jar", "app.jar");
|
||||||
}
|
}
|
||||||
|
|
||||||
private File findApplication() {
|
private MountableFile findApplication(String name) {
|
||||||
String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-tests-app");
|
return MountableFile.forHostPath(findJarFile(name).toPath());
|
||||||
File jar = new File(name);
|
}
|
||||||
Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
|
|
||||||
|
private File findJarFile(String name) {
|
||||||
|
String path = String.format("build/%1$s/build/libs/%1$s.jar", name);
|
||||||
|
File jar = new File(path);
|
||||||
|
Assert.state(jar.isFile(), () -> "Could not find " + path + ". Have you built it?");
|
||||||
return jar;
|
return jar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user