From 98940db17e3e55ee69646a8b46510f6d1ecad800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sun, 8 Sep 2019 10:20:04 +0200
Subject: [PATCH] add configureReproducible( Date lastModifiedDate ) API

this closes #121
---
 .../plexus/archiver/AbstractArchiver.java     | 41 +++++++++++++++++++
 .../codehaus/plexus/archiver/Archiver.java    | 17 ++++++++
 .../archiver/diags/DelgatingArchiver.java     |  7 ++++
 .../plexus/archiver/diags/NoOpArchiver.java   |  6 +++
 .../archiver/diags/TrackingArchiver.java      |  5 +++
 .../archiver/zip/AbstractZipArchiver.java     | 22 ++++++++++
 6 files changed, 98 insertions(+)

diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
index d5f80c17b..7b38a937f 100755
--- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -1257,4 +1257,45 @@ public String getOverrideGroupName()
     {
         return overrideGroupName;
     }
+
+    @Override
+    public void configureReproducible( Date lastModifiedDate )
+    {
+        // 1. force last modified date
+        setLastModifiedDate( normalizeLastModifiedDate( lastModifiedDate ) );
+
+        // 2. sort filenames in each directory when scanning filesystem
+        setFilenameComparator( new Comparator<String>()
+        {
+            @Override
+            public int compare( String s1, String s2 )
+            {
+                return s1.compareTo( s2 );
+            }
+        } );
+
+        // 3. ignore file/directory mode from filesystem, since they may vary based on local user umask
+        // notice: this overrides execute bit on Unix (that is already ignored on Windows)
+        setFileMode( Archiver.DEFAULT_FILE_MODE );
+        setDirectoryMode( Archiver.DEFAULT_DIR_MODE );
+
+        // 4. ignore uid/gid from filesystem (for tar)
+        setOverrideUid( 0 );
+        setOverrideUserName( "root" ); // is it possible to avoid this, like "tar --numeric-owner"?
+        setOverrideGid( 0 );
+        setOverrideGroupName( "root" );
+    }
+
+    /**
+     * Normalize last modified time value to get reproducible archive entries, based on
+     * archive binary format (tar uses UTC timestamp but zip uses local time then requires
+     * tweaks to make the value reproducible whatever the current timezone is).
+     *
+     * @param lastModifiedDate 
+     * @return
+     */
+    protected Date normalizeLastModifiedDate( Date lastModifiedDate )
+    {
+        return lastModifiedDate;
+    }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/Archiver.java b/src/main/java/org/codehaus/plexus/archiver/Archiver.java
index b6d9d8581..3c9442a36 100644
--- a/src/main/java/org/codehaus/plexus/archiver/Archiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/Archiver.java
@@ -415,6 +415,9 @@ ResourceIterator getResources()
     Date getLastModifiedDate();
 
     /**
+     * Set filename comparator, used to sort file entries when scanning directories since File.list() does not
+     * guarantee any order.
+     *
      * @since 4.2.0
      */
     void setFilenameComparator( Comparator<String> filenameComparator );
@@ -458,4 +461,18 @@ ResourceIterator getResources()
      * @since 4.2.0
      */
     String getOverrideGroupName();
+
+    /**
+     * Configure the archiver to create archives in a reproducible way (see <a
+     * href="https://reproducible-builds.org/>Reproducible Builds</a>). This will configure:
+     * <ul>
+     * <li>reproducible archive entries order,</li>
+     * <li>defined entries timestamp</li>
+     * <li>and reproducible entries Unix mode.</li>
+     * <ul>
+     * 
+     * @param lastModifiedDate the date to use for archive entries last modified time
+     * @since 4.2.0
+     */
+    void configureReproducible( Date lastModifiedDate );
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java
index 7dbad752b..e4b8a807f 100644
--- a/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java
@@ -398,4 +398,11 @@ public String getOverrideGroupName()
     {
         return target.getOverrideGroupName();
     }
+
+    @Override
+    public void configureReproducible( Date lastModifiedDate )
+    {
+        target.configureReproducible( lastModifiedDate );
+    }
+
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java
index c07389a54..2cca73291 100644
--- a/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java
@@ -414,4 +414,10 @@ public String getOverrideGroupName()
         return null;
     }
 
+    @Override
+    public void configureReproducible( Date lastModifiedDate )
+    {
+
+    }
+
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java
index fcb28e3ad..c1fb40c43 100644
--- a/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java
@@ -468,4 +468,9 @@ public String getOverrideGroupName()
     {
         return null;
     }
+
+    @Override
+    public void configureReproducible( Date lastModifiedDate )
+    {
+    }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
index bdc2fc93d..449ffe886 100755
--- a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -24,6 +24,8 @@
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.Hashtable;
 import java.util.Stack;
 import java.util.concurrent.ExecutionException;
@@ -833,4 +835,24 @@ protected String getArchiveType()
         return archiveType;
     }
 
+    @Override
+    protected Date normalizeLastModifiedDate( Date lastModifiedDate )
+    {
+        // timestamp of zip entries at zip storage level ignores timezone: managed in ZipEntry.setTime,
+        // that turns javaToDosTime: need to revert the operation here to get reproducible
+        // zip entry time
+        return new Date( dosToJavaTime( lastModifiedDate.getTime() ) );
+    }
+
+    /**
+     * Converts DOS time to Java time (number of milliseconds since epoch).
+     *
+     * @see java.util.zip.ZipEntry#setTime
+     * @see java.util.zip.ZipUtils#dosToJavaTime
+     */
+    private static long dosToJavaTime( long dosTime )
+    {
+        Calendar cal = Calendar.getInstance();
+        return dosTime - ( cal.get( Calendar.ZONE_OFFSET ) + cal.get( Calendar.DST_OFFSET ) );
+    }
 }