Jar patching is reproducible (#89)

gradlex-org · Dec 7, 2023 · 7902b5a · 7902b5a
1 parent f545ae7
commit 7902b5a
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java b/src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java
@@ -35,6 +35,7 @@
 import org.objectweb.asm.Opcodes;
 
 import javax.annotation.Nullable;
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -46,15 +47,18 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.GregorianCalendar;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -82,6 +86,9 @@ public abstract class ExtraJavaModuleInfoTransform implements TransformAction<Ex
     private static final Pattern JAR_SIGNATURE_PATH = Pattern.compile("^META-INF/[^/]+\\.(SF|RSA|DSA|sf|rsa|dsa)$");
     private static final String SERVICES_PREFIX = "META-INF/services/";
 
+    // See: org.gradle.api.internal.file.archive.ZipCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES
+    private static final long CONSTANT_TIME_FOR_ZIP_ENTRIES = new GregorianCalendar(1980, Calendar.FEBRUARY, 1, 0, 0, 0).getTimeInMillis();
+
     public interface Parameter extends TransformParameters {
         @Input
         MapProperty<String, ModuleSpec> getModuleSpecs();
@@ -260,7 +267,7 @@ private void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo mo
                 Set<String> packages = new TreeSet<>();
                 copyAndExtractProviders(inputStream, outputStream, !moduleInfo.getMergedJars().isEmpty(), providers, packages);
                 mergeJars(moduleInfo, outputStream, providers, packages);
-                outputStream.putNextEntry(new JarEntry("module-info.class"));
+                outputStream.putNextEntry(newReproducibleEntry("module-info.class"));
                 outputStream.write(addModuleInfo(moduleInfo, providers, versionFromFilePath(originalJar.toPath()),
                         moduleInfo.exportAllPackages ? packages : Collections.emptySet()));
                 outputStream.closeEntry();
@@ -271,7 +278,14 @@ private void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo mo
     }
 
     private JarOutputStream newJarOutputStream(OutputStream out, @Nullable Manifest manifest) throws IOException {
-        return manifest == null ? new JarOutputStream(out) : new JarOutputStream(out, manifest);
+        JarOutputStream jar = new JarOutputStream(out);
+        if (manifest != null) {
+            ZipEntry e = newReproducibleEntry(JarFile.MANIFEST_NAME);
+            jar.putNextEntry(e);
+            manifest.write(new BufferedOutputStream(jar));
+            jar.closeEntry();
+        }
+        return jar;
     }
 
     private void copyAndExtractProviders(JarInputStream inputStream, JarOutputStream outputStream, boolean willMergeJars, Map<String, List<String>> providers, Set<String> packages) throws IOException {
@@ -450,8 +464,7 @@ private void mergeJars(ModuleSpec moduleSpec, JarOutputStream outputStream, Map<
 
     private void mergeServiceProviderFiles(JarOutputStream outputStream, Map<String, List<String>> providers) throws IOException {
         for (Map.Entry<String, List<String>> provider : providers.entrySet()) {
-            JarEntry jarEntry = new JarEntry(SERVICES_PREFIX + provider.getKey());
-            outputStream.putNextEntry(jarEntry);
+            outputStream.putNextEntry(newReproducibleEntry(SERVICES_PREFIX + provider.getKey()));
             for (String implementation : provider.getValue()) {
                 outputStream.write(implementation.getBytes());
                 outputStream.write("\n".getBytes());
@@ -460,6 +473,12 @@ private void mergeServiceProviderFiles(JarOutputStream outputStream, Map<String,
         }
     }
 
+    private JarEntry newReproducibleEntry(String name) {
+        JarEntry jarEntry = new JarEntry(name);
+        jarEntry.setTime(CONSTANT_TIME_FOR_ZIP_ENTRIES);
+        return jarEntry;
+    }
+
     private byte[] readAllBytes(InputStream inputStream) throws IOException {
         final int bufLen = 4 * 0x400;
         byte[] buf = new byte[bufLen];