Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extract all files under META-INF

Browse Source 
Closes gh-40456
This commit is contained in:
Moritz Halbritter 2024-04-22 11:53:26 +02:00
parent 4118de7f59
commit de560a933c
5 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/ExtractCommand.java
View File

@ -27,6 +27,7 @@ import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.FileTime;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
@ -249,9 +250,10 @@ class ExtractCommand extends Command {
Manifest manifest = jarStructure.createLauncherManifest((library) -> librariesDirectory + library);
mkdirs(file.getParentFile());
try (JarOutputStream output = new JarOutputStream(new FileOutputStream(file), manifest)) {
EnumSet<Type> allowedTypes = EnumSet.of(Type.APPLICATION_CLASS_OR_RESOURCE, Type.META_INF);
withJarEntries(this.context.getArchiveFile(), ((stream, jarEntry) -> {
Entry entry = jarStructure.resolve(jarEntry);
if (isType(entry, Type.APPLICATION_CLASS_OR_RESOURCE) && StringUtils.hasLength(entry.location())) {
if (entry != null && allowedTypes.contains(entry.type()) && StringUtils.hasLength(entry.location())) {
JarEntry newJarEntry = createJarEntry(entry.location(), jarEntry);
output.putNextEntry(newJarEntry);
StreamUtils.copy(stream, output);

10
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/IndexedJarStructure.java
View File

@ -24,6 +24,7 @@ import java.nio.file.NoSuchFileException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.function.UnaryOperator;
import java.util.jar.Attributes;
import java.util.jar.Attributes.Name;
@ -48,6 +49,9 @@ class IndexedJarStructure implements JarStructure {
private static final List<String> MANIFEST_DENY_LIST = List.of("Start-Class", "Spring-Boot-Classes",
"Spring-Boot-Lib", "Spring-Boot-Classpath-Index", "Spring-Boot-Layers-Index");
private static final Set<String> ENTRY_IGNORE_LIST = Set.of("META-INF/", "META-INF/MANIFEST.MF",
"META-INF/services/java.nio.file.spi.FileSystemProvider");
private final Manifest originalManifest;
private final String libLocation;
@ -89,6 +93,9 @@ class IndexedJarStructure implements JarStructure {
@Override
public Entry resolve(String name) {
if (ENTRY_IGNORE_LIST.contains(name)) {
return null;
}
if (this.classpathEntries.contains(name)) {
return new Entry(name, toStructureDependency(name), Type.LIBRARY);
}
@ -98,6 +105,9 @@ class IndexedJarStructure implements JarStructure {
if (name.startsWith("org/springframework/boot/loader")) {
return new Entry(name, name, Type.LOADER);
}
if (name.startsWith("META-INF/")) {
return new Entry(name, name, Type.META_INF);
}
return null;
}

2
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/JarStructure.java
View File

@ -71,7 +71,7 @@ interface JarStructure {
enum Type {
LIBRARY, APPLICATION_CLASS_OR_RESOURCE, LOADER
LIBRARY, APPLICATION_CLASS_OR_RESOURCE, LOADER, META_INF
}

11
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/test/java/org/springframework/boot/jarmode/tools/ExtractCommandTests.java
View File

@ -62,7 +62,8 @@ class ExtractCommandTests extends AbstractJarModeTests {
"BOOT-INF/lib/dependency-2.jar", "/jar-contents/dependency-2", "BOOT-INF/lib/dependency-3-SNAPSHOT.jar",
"/jar-contents/dependency-3-SNAPSHOT", "org/springframework/boot/loader/launch/JarLauncher.class",
"/jar-contents/JarLauncher", "BOOT-INF/classes/application.properties",
"/jar-contents/application.properties");
"/jar-contents/application.properties", "META-INF/build-info.properties",
"/jar-contents/build-info.properties");
}
private File file(String name) {
@ -207,6 +208,14 @@ class ExtractCommandTests extends AbstractJarModeTests {
.contains("out/test.jar");
}
@Test
void shouldExtractFilesUnderMetaInf() throws IOException {
run(ExtractCommandTests.this.archive);
File application = file("test/test.jar");
List<String> entryNames = getJarEntryNames(application);
assertThat(entryNames).contains("META-INF/build-info.properties");
}
}
@Nested

1
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/test/resources/jar-contents/build-info.properties Normal file
View File

@ -0,0 +1 @@
build.artifact=test