mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Write signature files to uber jars to for Oracle Java 17 verification
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF` file whenever there is a nested signed jar. This update allows Oracle Java 17 to correctly verify the nested JARs. The file is required because `JarVerifier` has code roughly equivalent to: if (!jarManifestNameChecked && SharedSecrets .getJavaUtilZipFileAccess().getManifestName(jf, true) == null) { throw new JarException("The JCE Provider " + jarURL.toString() + " is not signed."); } The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)` call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)` which is a private method that we cannot override in our `NestedJarFile` subclass. By writing an empty `.SF` file we ensure that the `Manifest` is always returned because there are always "signature related files". Fixes gh-28837
This commit is contained in:
parent
fe752dedef
commit
33c5e1269a
@ -123,12 +123,13 @@ class BootArchiveSupport {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
|
CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
|
||||||
LoaderImplementation loaderImplementation) {
|
LoaderImplementation loaderImplementation, boolean supportsSignatureFile) {
|
||||||
return createCopyAction(jar, resolvedDependencies, loaderImplementation, null, null);
|
return createCopyAction(jar, resolvedDependencies, loaderImplementation, supportsSignatureFile, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
|
CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
|
||||||
LoaderImplementation loaderImplementation, LayerResolver layerResolver, String layerToolsLocation) {
|
LoaderImplementation loaderImplementation, boolean supportsSignatureFile, LayerResolver layerResolver,
|
||||||
|
String layerToolsLocation) {
|
||||||
File output = jar.getArchiveFile().get().getAsFile();
|
File output = jar.getArchiveFile().get().getAsFile();
|
||||||
Manifest manifest = jar.getManifest();
|
Manifest manifest = jar.getManifest();
|
||||||
boolean preserveFileTimestamps = jar.isPreserveFileTimestamps();
|
boolean preserveFileTimestamps = jar.isPreserveFileTimestamps();
|
||||||
@ -143,7 +144,8 @@ class BootArchiveSupport {
|
|||||||
String encoding = jar.getMetadataCharset();
|
String encoding = jar.getMetadataCharset();
|
||||||
CopyAction action = new BootZipCopyAction(output, manifest, preserveFileTimestamps, dirMode, fileMode,
|
CopyAction action = new BootZipCopyAction(output, manifest, preserveFileTimestamps, dirMode, fileMode,
|
||||||
includeDefaultLoader, layerToolsLocation, requiresUnpack, exclusions, launchScript, librarySpec,
|
includeDefaultLoader, layerToolsLocation, requiresUnpack, exclusions, launchScript, librarySpec,
|
||||||
compressionResolver, encoding, resolvedDependencies, layerResolver, loaderImplementation);
|
compressionResolver, encoding, resolvedDependencies, supportsSignatureFile, layerResolver,
|
||||||
|
loaderImplementation);
|
||||||
return jar.isReproducibleFileOrder() ? new ReproducibleOrderingCopyAction(action) : action;
|
return jar.isReproducibleFileOrder() ? new ReproducibleOrderingCopyAction(action) : action;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,10 +147,10 @@ public abstract class BootJar extends Jar implements BootArchive {
|
|||||||
if (!isLayeredDisabled()) {
|
if (!isLayeredDisabled()) {
|
||||||
LayerResolver layerResolver = new LayerResolver(this.resolvedDependencies, this.layered, this::isLibrary);
|
LayerResolver layerResolver = new LayerResolver(this.resolvedDependencies, this.layered, this::isLibrary);
|
||||||
String layerToolsLocation = this.layered.getIncludeLayerTools().get() ? LIB_DIRECTORY : null;
|
String layerToolsLocation = this.layered.getIncludeLayerTools().get() ? LIB_DIRECTORY : null;
|
||||||
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, layerResolver,
|
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, true,
|
||||||
layerToolsLocation);
|
layerResolver, layerToolsLocation);
|
||||||
}
|
}
|
||||||
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation);
|
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -121,10 +121,10 @@ public abstract class BootWar extends War implements BootArchive {
|
|||||||
if (!isLayeredDisabled()) {
|
if (!isLayeredDisabled()) {
|
||||||
LayerResolver layerResolver = new LayerResolver(this.resolvedDependencies, this.layered, this::isLibrary);
|
LayerResolver layerResolver = new LayerResolver(this.resolvedDependencies, this.layered, this::isLibrary);
|
||||||
String layerToolsLocation = this.layered.getIncludeLayerTools().get() ? LIB_DIRECTORY : null;
|
String layerToolsLocation = this.layered.getIncludeLayerTools().get() ? LIB_DIRECTORY : null;
|
||||||
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, layerResolver,
|
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, false,
|
||||||
layerToolsLocation);
|
layerResolver, layerToolsLocation);
|
||||||
}
|
}
|
||||||
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation);
|
return this.support.createCopyAction(this, this.resolvedDependencies, loaderImplementation, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -111,6 +111,8 @@ class BootZipCopyAction implements CopyAction {
|
|||||||
|
|
||||||
private final ResolvedDependencies resolvedDependencies;
|
private final ResolvedDependencies resolvedDependencies;
|
||||||
|
|
||||||
|
private final boolean supportsSignatureFile;
|
||||||
|
|
||||||
private final LayerResolver layerResolver;
|
private final LayerResolver layerResolver;
|
||||||
|
|
||||||
private final LoaderImplementation loaderImplementation;
|
private final LoaderImplementation loaderImplementation;
|
||||||
@ -119,7 +121,7 @@ class BootZipCopyAction implements CopyAction {
|
|||||||
boolean includeDefaultLoader, String layerToolsLocation, Spec<FileTreeElement> requiresUnpack,
|
boolean includeDefaultLoader, String layerToolsLocation, Spec<FileTreeElement> requiresUnpack,
|
||||||
Spec<FileTreeElement> exclusions, LaunchScriptConfiguration launchScript, Spec<FileCopyDetails> librarySpec,
|
Spec<FileTreeElement> exclusions, LaunchScriptConfiguration launchScript, Spec<FileCopyDetails> librarySpec,
|
||||||
Function<FileCopyDetails, ZipCompression> compressionResolver, String encoding,
|
Function<FileCopyDetails, ZipCompression> compressionResolver, String encoding,
|
||||||
ResolvedDependencies resolvedDependencies, LayerResolver layerResolver,
|
ResolvedDependencies resolvedDependencies, boolean supportsSignatureFile, LayerResolver layerResolver,
|
||||||
LoaderImplementation loaderImplementation) {
|
LoaderImplementation loaderImplementation) {
|
||||||
this.output = output;
|
this.output = output;
|
||||||
this.manifest = manifest;
|
this.manifest = manifest;
|
||||||
@ -135,6 +137,7 @@ class BootZipCopyAction implements CopyAction {
|
|||||||
this.compressionResolver = compressionResolver;
|
this.compressionResolver = compressionResolver;
|
||||||
this.encoding = encoding;
|
this.encoding = encoding;
|
||||||
this.resolvedDependencies = resolvedDependencies;
|
this.resolvedDependencies = resolvedDependencies;
|
||||||
|
this.supportsSignatureFile = supportsSignatureFile;
|
||||||
this.layerResolver = layerResolver;
|
this.layerResolver = layerResolver;
|
||||||
this.loaderImplementation = loaderImplementation;
|
this.loaderImplementation = loaderImplementation;
|
||||||
}
|
}
|
||||||
@ -302,6 +305,7 @@ class BootZipCopyAction implements CopyAction {
|
|||||||
void finish() throws IOException {
|
void finish() throws IOException {
|
||||||
writeLoaderEntriesIfNecessary(null);
|
writeLoaderEntriesIfNecessary(null);
|
||||||
writeJarToolsIfNecessary();
|
writeJarToolsIfNecessary();
|
||||||
|
writeSignatureFileIfNecessary();
|
||||||
writeClassPathIndexIfNecessary();
|
writeClassPathIndexIfNecessary();
|
||||||
writeNativeImageArgFileIfNecessary();
|
writeNativeImageArgFileIfNecessary();
|
||||||
// We must write the layer index last
|
// We must write the layer index last
|
||||||
@ -351,6 +355,22 @@ class BootZipCopyAction implements CopyAction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void writeSignatureFileIfNecessary() throws IOException {
|
||||||
|
if (BootZipCopyAction.this.supportsSignatureFile && hasSignedLibrary()) {
|
||||||
|
writeEntry("META-INF/BOOT.SF", (out) -> {
|
||||||
|
}, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasSignedLibrary() throws IOException {
|
||||||
|
for (FileCopyDetails writtenLibrary : this.writtenLibraries.values()) {
|
||||||
|
if (FileUtils.isSignedJarFile(writtenLibrary.getFile())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private void writeClassPathIndexIfNecessary() throws IOException {
|
private void writeClassPathIndexIfNecessary() throws IOException {
|
||||||
Attributes manifestAttributes = BootZipCopyAction.this.manifest.getAttributes();
|
Attributes manifestAttributes = BootZipCopyAction.this.manifest.getAttributes();
|
||||||
String classPathIndex = (String) manifestAttributes.get("Spring-Boot-Classpath-Index");
|
String classPathIndex = (String) manifestAttributes.get("Spring-Boot-Classpath-Index");
|
||||||
|
@ -16,12 +16,15 @@
|
|||||||
|
|
||||||
package org.springframework.boot.gradle.tasks.bundling;
|
package org.springframework.boot.gradle.tasks.bundling;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
import java.util.jar.JarFile;
|
||||||
|
|
||||||
import org.gradle.testkit.runner.BuildResult;
|
import org.gradle.testkit.runner.BuildResult;
|
||||||
|
import org.gradle.testkit.runner.TaskOutcome;
|
||||||
import org.junit.jupiter.api.TestTemplate;
|
import org.junit.jupiter.api.TestTemplate;
|
||||||
|
|
||||||
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
import org.springframework.boot.gradle.junit.GradleCompatibility;
|
||||||
@ -42,6 +45,15 @@ class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests {
|
|||||||
super("bootJar", "BOOT-INF/lib/", "BOOT-INF/classes/", "BOOT-INF/");
|
super("bootJar", "BOOT-INF/lib/", "BOOT-INF/classes/", "BOOT-INF/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestTemplate
|
||||||
|
void signed() throws Exception {
|
||||||
|
assertThat(this.gradleBuild.build("bootJar").task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||||
|
File jar = new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0];
|
||||||
|
try (JarFile jarFile = new JarFile(jar)) {
|
||||||
|
assertThat(jarFile.getEntry("META-INF/BOOT.SF")).isNotNull();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@TestTemplate
|
@TestTemplate
|
||||||
void whenAResolvableCopyOfAnUnresolvableConfigurationIsResolvedThenResolutionSucceeds() {
|
void whenAResolvableCopyOfAnUnresolvableConfigurationIsResolvedThenResolutionSucceeds() {
|
||||||
this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.0").build("build");
|
this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.0").build("build");
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '{version}'
|
||||||
|
}
|
||||||
|
|
||||||
|
bootJar {
|
||||||
|
mainClass = 'com.example.Application'
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
maven { url "file:repository" }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation("org.bouncycastle:bcprov-jdk18on:1.76")
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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,9 @@ package org.springframework.boot.loader.tools;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.jar.Attributes;
|
||||||
|
import java.util.jar.JarFile;
|
||||||
|
import java.util.jar.Manifest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utilities for manipulating files and directories in Spring Boot tooling.
|
* Utilities for manipulating files and directories in Spring Boot tooling.
|
||||||
@ -61,4 +64,31 @@ public abstract class FileUtils {
|
|||||||
return Digest.sha1(InputStreamSupplier.forFile(file));
|
return Digest.sha1(InputStreamSupplier.forFile(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns {@code true} if the given jar file has been signed.
|
||||||
|
* @param file the file to check
|
||||||
|
* @return if the file has been signed
|
||||||
|
* @throws IOException on IO error
|
||||||
|
*/
|
||||||
|
public static boolean isSignedJarFile(File file) throws IOException {
|
||||||
|
try (JarFile jarFile = new JarFile(file)) {
|
||||||
|
if (hasDigestEntry(jarFile.getManifest())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean hasDigestEntry(Manifest manifest) {
|
||||||
|
return (manifest != null) && manifest.getEntries().values().stream().anyMatch(FileUtils::hasDigestName);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean hasDigestName(Attributes attributes) {
|
||||||
|
return attributes.keySet().stream().anyMatch(FileUtils::isDigestName);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isDigestName(Object name) {
|
||||||
|
return String.valueOf(name).toUpperCase().endsWith("-DIGEST");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -217,6 +217,7 @@ public abstract class Packager {
|
|||||||
if (isLayered()) {
|
if (isLayered()) {
|
||||||
writeLayerIndex(writer);
|
writeLayerIndex(writer);
|
||||||
}
|
}
|
||||||
|
writeSignatureFileIfNecessary(writtenLibraries, writer);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void writeLoaderClasses(AbstractJarWriter writer) throws IOException {
|
private void writeLoaderClasses(AbstractJarWriter writer) throws IOException {
|
||||||
@ -263,6 +264,10 @@ public abstract class Packager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void writeSignatureFileIfNecessary(Map<String, Library> writtenLibraries, AbstractJarWriter writer)
|
||||||
|
throws IOException {
|
||||||
|
}
|
||||||
|
|
||||||
private EntryTransformer getEntityTransformer() {
|
private EntryTransformer getEntityTransformer() {
|
||||||
if (getLayout() instanceof RepackagingLayout repackagingLayout) {
|
if (getLayout() instanceof RepackagingLayout repackagingLayout) {
|
||||||
return new RepackagingEntryTransformer(repackagingLayout);
|
return new RepackagingEntryTransformer(repackagingLayout);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
@ -19,6 +19,7 @@ package org.springframework.boot.loader.tools;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.attribute.FileTime;
|
import java.nio.file.attribute.FileTime;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
@ -46,6 +47,24 @@ public class Repackager extends Packager {
|
|||||||
super(source);
|
super(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void writeSignatureFileIfNecessary(Map<String, Library> writtenLibraries, AbstractJarWriter writer)
|
||||||
|
throws IOException {
|
||||||
|
if (getSource().getName().toLowerCase().endsWith(".jar") && hasSignedLibrary(writtenLibraries)) {
|
||||||
|
writer.writeEntry("META-INF/BOOT.SF", (entryWriter) -> {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasSignedLibrary(Map<String, Library> writtenLibraries) throws IOException {
|
||||||
|
for (Library library : writtenLibraries.values()) {
|
||||||
|
if (!(library instanceof JarModeLibrary) && FileUtils.isSignedJarFile(library.getFile())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets if source files should be backed up when they would be overwritten.
|
* Sets if source files should be backed up when they would be overwritten.
|
||||||
* @param backupSource if source files should be backed up
|
* @param backupSource if source files should be backed up
|
||||||
|
@ -660,7 +660,7 @@ abstract class AbstractPackagerTests<P extends Packager> {
|
|||||||
return library.getFile();
|
return library.getFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Library newLibrary(File file, LibraryScope scope, boolean unpackRequired) {
|
protected Library newLibrary(File file, LibraryScope scope, boolean unpackRequired) {
|
||||||
return new Library(null, file, scope, null, unpackRequired, false, true);
|
return new Library(null, file, scope, null, unpackRequired, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -687,7 +687,7 @@ abstract class AbstractPackagerTests<P extends Packager> {
|
|||||||
&& hasPackagedEntry("org/springframework/boot/loader/launch/JarLauncher.class");
|
&& hasPackagedEntry("org/springframework/boot/loader/launch/JarLauncher.class");
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean hasPackagedEntry(String name) throws IOException {
|
protected boolean hasPackagedEntry(String name) throws IOException {
|
||||||
return getPackagedEntry(name) != null;
|
return getPackagedEntry(name) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,9 +17,13 @@
|
|||||||
package org.springframework.boot.loader.tools;
|
package org.springframework.boot.loader.tools;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
import java.util.jar.JarOutputStream;
|
||||||
|
import java.util.jar.Manifest;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@ -99,4 +103,28 @@ class FileUtilsTests {
|
|||||||
assertThat(FileUtils.sha1Hash(file)).isEqualTo("7037807198c22a7d2b0807371d763779a84fdfcf");
|
assertThat(FileUtils.sha1Hash(file)).isEqualTo("7037807198c22a7d2b0807371d763779a84fdfcf");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isSignedJarFileWhenSignedReturnsTrue() throws IOException {
|
||||||
|
Manifest manifest = new Manifest(getClass().getResourceAsStream("signed-manifest.mf"));
|
||||||
|
File jarFile = new File(this.tempDir, "test.jar");
|
||||||
|
writeTestJar(manifest, jarFile);
|
||||||
|
assertThat(FileUtils.isSignedJarFile(jarFile)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isSignedJarFileWhenNotSignedReturnsFalse() throws IOException {
|
||||||
|
Manifest manifest = new Manifest();
|
||||||
|
File jarFile = new File(this.tempDir, "test.jar");
|
||||||
|
writeTestJar(manifest, jarFile);
|
||||||
|
assertThat(FileUtils.isSignedJarFile(jarFile)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeTestJar(Manifest manifest, File jarFile) throws IOException, FileNotFoundException {
|
||||||
|
try (JarOutputStream out = new JarOutputStream(new FileOutputStream(jarFile))) {
|
||||||
|
out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
|
||||||
|
manifest.write(out);
|
||||||
|
out.closeEntry();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.jar.Attributes;
|
||||||
import java.util.jar.JarEntry;
|
import java.util.jar.JarEntry;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
import java.util.jar.Manifest;
|
import java.util.jar.Manifest;
|
||||||
@ -218,6 +219,20 @@ class RepackagerTests extends AbstractPackagerTests<Repackager> {
|
|||||||
assertThat(stopWatch.getTotalTimeMillis()).isLessThan(5000);
|
assertThat(stopWatch.getTotalTimeMillis()).isLessThan(5000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void signedJar() throws Exception {
|
||||||
|
Repackager packager = createPackager();
|
||||||
|
packager.setMainClass("a.b.C");
|
||||||
|
Manifest manifest = new Manifest();
|
||||||
|
Attributes attributes = new Attributes();
|
||||||
|
attributes.putValue("SHA1-Digest", "0000");
|
||||||
|
manifest.getEntries().put("a/b/C.class", attributes);
|
||||||
|
TestJarFile libJar = new TestJarFile(this.tempDir);
|
||||||
|
libJar.addManifest(manifest);
|
||||||
|
execute(packager, (callback) -> callback.library(newLibrary(libJar.getFile(), LibraryScope.COMPILE, false)));
|
||||||
|
assertThat(hasPackagedEntry("META-INF/BOOT.SF")).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
private boolean hasLauncherClasses(File file) throws IOException {
|
private boolean hasLauncherClasses(File file) throws IOException {
|
||||||
return hasEntry(file, "org/springframework/boot/")
|
return hasEntry(file, "org/springframework/boot/")
|
||||||
&& hasEntry(file, "org/springframework/boot/loader/launch/JarLauncher.class");
|
&& hasEntry(file, "org/springframework/boot/loader/launch/JarLauncher.class");
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
Manifest-Version: 1.0
|
||||||
|
Created-By: 1.5.0_08 (Sun Microsystems Inc.)
|
||||||
|
Specification-Version: 1.1
|
||||||
|
|
||||||
|
Name: org/bouncycastle/pqc/legacy/math/linearalgebra/GoppaCode.class
|
||||||
|
SHA-256-Digest: wNhEfeTvNG9ggqKfLjQDDoFoDqeWwGUc47JiL7VqxqU=
|
||||||
|
|
||||||
|
Name: org/bouncycastle/crypto/modes/gcm/Tables8kGCMMultiplier.class
|
||||||
|
SHA-256-Digest: nqljr9DNx4nNie4sbkZajVenvd3LdMF3X5s5dmSMToM=
|
@ -459,4 +459,12 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestTemplate
|
||||||
|
void whenSigned(MavenBuild mavenBuild) {
|
||||||
|
mavenBuild.project("jar-signed").execute((project) -> {
|
||||||
|
File repackaged = new File(project, "target/jar-signed-0.0.1.BUILD-SNAPSHOT.jar");
|
||||||
|
assertThat(jar(repackaged)).hasEntryWithName("META-INF/BOOT.SF");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>org.springframework.boot.maven.it</groupId>
|
||||||
|
<artifactId>jar-signed</artifactId>
|
||||||
|
<version>0.0.1.BUILD-SNAPSHOT</version>
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<maven.compiler.source>@java.version@</maven.compiler.source>
|
||||||
|
<maven.compiler.target>@java.version@</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>@project.groupId@</groupId>
|
||||||
|
<artifactId>@project.artifactId@</artifactId>
|
||||||
|
<version>@project.version@</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>repackage</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>@maven-jar-plugin.version@</version>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifest>
|
||||||
|
<mainClass>some.random.Main</mainClass>
|
||||||
|
</manifest>
|
||||||
|
<manifestEntries>
|
||||||
|
<Not-Used>Foo</Not-Used>
|
||||||
|
</manifestEntries>
|
||||||
|
</archive>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context</artifactId>
|
||||||
|
<version>@spring-framework.version@</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.servlet</groupId>
|
||||||
|
<artifactId>jakarta.servlet-api</artifactId>
|
||||||
|
<version>@jakarta-servlet.version@</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.bouncycastle</groupId>
|
||||||
|
<artifactId>bcprov-jdk18on</artifactId>
|
||||||
|
<version>1.76</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2023 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.test;
|
||||||
|
|
||||||
|
public class SampleApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -37,7 +37,6 @@ import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnava
|
|||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assumptions.assumeThat;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests loader that supports fat jars.
|
* Integration tests loader that supports fat jars.
|
||||||
@ -66,7 +65,6 @@ class LoaderIntegrationTests {
|
|||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("javaRuntimes")
|
@MethodSource("javaRuntimes")
|
||||||
void runSignedJar(JavaRuntime javaRuntime) {
|
void runSignedJar(JavaRuntime javaRuntime) {
|
||||||
assumeThat(javaRuntime.toString()).isNotEqualTo("Oracle JDK 17"); // gh-28837
|
|
||||||
try (GenericContainer<?> container = createContainer(javaRuntime, "spring-boot-loader-tests-signed-jar",
|
try (GenericContainer<?> container = createContainer(javaRuntime, "spring-boot-loader-tests-signed-jar",
|
||||||
null)) {
|
null)) {
|
||||||
container.start();
|
container.start();
|
||||||
|
Loading…
Reference in New Issue
Block a user