🎨 Zip: Clone the entry ourselves, omitting the CRC-32

docbleach · Apr 24, 2017 · 0024fd7 · 0024fd7
1 parent 483579d
commit 0024fd7
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/module/module-zip/src/main/java/xyz/docbleach/module/zip/ArchiveBleach.java b/module/module-zip/src/main/java/xyz/docbleach/module/zip/ArchiveBleach.java
@@ -86,7 +86,7 @@ private void sanitizeFile(BleachSession session, ZipInputStream zipIn, ZipOutput
             streamBuilder.close();
         }
 
-        ZipEntry newEntry = new ZipEntry(entry);
+        ZipEntry newEntry = cloneEntry(entry);
         newEntry.setCompressedSize(-1);
         newEntry.setSize(out.size());
         newEntry.setComment(newEntry.getComment() + " - DocBleach");
@@ -95,4 +95,25 @@ private void sanitizeFile(BleachSession session, ZipInputStream zipIn, ZipOutput
         out.writeTo(zipOut);
         out.close();
     }
+
+    // Copies everything except size & CRC-32
+    private ZipEntry cloneEntry(ZipEntry entry) {
+        ZipEntry newEntry = new ZipEntry(entry.getName());
+
+        newEntry.setTime(entry.getTime());
+        if (entry.getCreationTime() != null) {
+            newEntry.setCreationTime(entry.getCreationTime());
+        }
+        if (entry.getLastModifiedTime() != null) {
+            newEntry.setLastModifiedTime(entry.getLastModifiedTime());
+        }
+        if (entry.getLastAccessTime() != null) {
+            newEntry.setLastAccessTime(entry.getLastAccessTime());
+        }
+        newEntry.setComment(entry.getComment());
+        newEntry.setExtra(entry.getExtra());
+        newEntry.setMethod(entry.getMethod());
+
+        return newEntry;
+    }
 }