refactor zip utils, try to correctly zip v2 package

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -792,8 +792,8 @@ private File signPackage(File projectFolder, String keyStorePassword, String fil
       File signedPackageV2 = new File(projectFolder,
                                       path + sketch.getName().toLowerCase() + "_release_signed_v2." + fileExt);
       ApkSignerV2.signJarV2(signedPackageV1, signedPackageV2,
-      AndroidKeyStore.ALIAS_STRING, keyStorePassword, 
-      keyStore.getAbsolutePath(), keyStorePassword);
+          AndroidKeyStore.ALIAS_STRING, keyStorePassword, 
+          keyStore.getAbsolutePath(), keyStorePassword);
       return signedPackageV2;
     } else {
       File alignedPackage = zipalignPackage(signedPackageV1, projectFolder, fileExt);

mode/src/processing/mode/android/ApkSignerV2.java

@@ -49,6 +49,10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import java.util.jar.Manifest;
+import java.util.jar.Attributes;
+import java.util.jar.JarOutputStream;
+
 /**
  * APK Signature Scheme v2 signer.
  *
@@ -121,6 +125,10 @@ public static final class SignerConfig {
     }
 
 
+    private static final String DIGEST_ALGORITHM = "SHA1";
+    private static final String DIGEST_ATTR = "SHA1-Digest";
+
+
     public static void signJarV2(File jarToSign, File outputJar, String alias, 
                                  String keypass, String keystore, String storepass) 
                                  throws GeneralSecurityException, IOException, 
@@ -162,7 +170,9 @@ public static void signJarV2(File jarToSign, File outputJar, String alias,
       inputBuffer.rewind();
       ByteBuffer[] output = sign(inputBuffer, signerConfigs);
 
-      FileOutputStream outputStream = new FileOutputStream(outputJar);
+      // Save byte buffer with V2 signed jar into temp file
+      File tempJar = new File(outputJar.getAbsolutePath() + ".tmp");
+      FileOutputStream outputStream = new FileOutputStream(tempJar);
       for (ByteBuffer buf: output) {        
         if (buf.hasArray()) {
           outputStream.write(buf.array());
@@ -174,6 +184,16 @@ public static void signJarV2(File jarToSign, File outputJar, String alias,
       }
       outputStream.close();
 
+      // Create zipped package
+      Manifest manifest = new Manifest();
+      Attributes main = manifest.getMainAttributes();
+      main.putValue("Manifest-Version", "1.0");
+      main.putValue("Created-By", "1.0 (Android)");      
+      main.putValue("X-Android-APK-Signed", "true");
+
+      JarOutputStream signedJar = new JarOutputStream(new FileOutputStream(outputJar, false));
+      ZipUtils.writeZip(new FileInputStream(tempJar), signedJar, manifest, DIGEST_ALGORITHM, DIGEST_ATTR);
+
       System.out.println("DONE!");
     }
 

mode/src/processing/mode/android/JarSigner.java

@@ -33,8 +33,6 @@
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 import java.util.Base64;
 import sun.security.pkcs.SignerInfo;
 import sun.security.x509.AlgorithmId;
@@ -49,8 +47,7 @@ public class JarSigner {
   private static final String DIGEST_ALGORITHM = "SHA1";
   private static final String DIGEST_ATTR = "SHA1-Digest";
   private static final String DIGEST_MANIFEST_ATTR = "SHA1-Digest-Manifest";
-  private static SignatureOutputStream certFileContents = null;
-  private static byte[] buffer;
+  private static SignatureOutputStream certFileContents = null;  
 
   public static void signJarV1(File jarToSign, File outputJar, String alias, 
       String keypass, String keystore, String storepass)
@@ -84,73 +81,11 @@ public static void signJarV1(File jarToSign, File outputJar, String alias,
       main.putValue("X-Android-APK-Signed", "true");
     } 
 
-    writeZip(new FileInputStream(jarToSign), signedJar, manifest);
+    ZipUtils.writeZip(new FileInputStream(jarToSign), signedJar, manifest, DIGEST_ALGORITHM, DIGEST_ATTR);
 
     closeJar(signedJar, manifest, privateKey, x509Cert);
   }
 
-  private static void writeZip(InputStream input, JarOutputStream output, Manifest manifest)
-      throws IOException, NoSuchAlgorithmException {    
-    Base64.Encoder base64Encoder = Base64.getEncoder();
-    MessageDigest messageDigest = MessageDigest.getInstance(DIGEST_ALGORITHM);
-    buffer = new byte[4096];
-    
-    ZipInputStream zis = new ZipInputStream(input);
-
-    try {
-      // loop on the entries of the intermediary package and put them in the final package.
-      ZipEntry entry;
-      while ((entry = zis.getNextEntry()) != null) {
-        String name = entry.getName();
-
-        // do not take directories or anything inside a potential META-INF folder.
-        if (entry.isDirectory() || name.startsWith("META-INF/")) {
-          continue;
-        }
-
-        JarEntry newEntry;
-
-        // Preserve the STORED method of the input entry.
-        if (entry.getMethod() == JarEntry.STORED) {
-          newEntry = new JarEntry(entry);
-        } else {
-          // Create a new entry so that the compressed len is recomputed.
-          newEntry = new JarEntry(name);
-        }
-
-        writeEntry(output, zis, newEntry, messageDigest, manifest, base64Encoder);
-
-        zis.closeEntry();
-      }
-    } finally {
-      zis.close();
-    }
-  }
-
-  private static void writeEntry(JarOutputStream output, InputStream input, JarEntry entry, 
-      MessageDigest digest, Manifest manifest, Base64.Encoder encoder) throws IOException {
-    output.putNextEntry(entry);
-
-    // Write input stream to the jar output.
-    int count;
-    while ((count = input.read(buffer)) != -1) {
-      output.write(buffer, 0, count);
-
-      if (digest != null) digest.update(buffer, 0, count);
-    }
-
-    output.closeEntry();
-
-    if (manifest != null) {
-      Attributes attr = manifest.getAttributes(entry.getName());
-      if (attr == null) {
-        attr = new Attributes();
-        manifest.getEntries().put(entry.getName(), attr);
-      }
-      attr.putValue(DIGEST_ATTR, encoder.encodeToString(digest.digest()));
-    }
-  }
-  
   private static void closeJar(JarOutputStream jar, Manifest manifest, 
       PrivateKey key, X509Certificate cert) 
       throws IOException, GeneralSecurityException {

mode/src/processing/mode/android/ZipUtils.java

@@ -18,13 +18,27 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.jar.JarEntry;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.Base64;
+
 /**
  * Assorted ZIP format helpers.
  *
  * <p>NOTE: Most helper methods operating on {@code ByteBuffer} instances expect that the byte
  * order of these buffers is little-endian.
  */
 public abstract class ZipUtils {
+    private static byte[] buffer;
+
     private ZipUtils() {}
     private static final int ZIP_EOCD_REC_MIN_SIZE = 22;
     private static final int ZIP_EOCD_REC_SIG = 0x06054b50;
@@ -142,4 +156,66 @@ private static void setUnsignedInt32(ByteBuffer buffer, int offset, long value)
         }
         buffer.putInt(buffer.position() + offset, (int) value);
     }
+
+    public static void writeZip(InputStream input, JarOutputStream output, Manifest manifest, 
+        String digestAlgorithm, String digestAttr)
+        throws IOException, NoSuchAlgorithmException {    
+        Base64.Encoder base64Encoder = Base64.getEncoder();
+        MessageDigest messageDigest = MessageDigest.getInstance(digestAlgorithm);
+        buffer = new byte[4096];
+  
+        ZipInputStream zis = new ZipInputStream(input);
+
+        try {
+            // loop on the entries of the intermediary package and put them in the final package.
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                String name = entry.getName();
+
+                // do not take directories or anything inside a potential META-INF folder.
+                if (entry.isDirectory() || name.startsWith("META-INF/")) {
+                    continue;
+                }
+
+                JarEntry newEntry;
+
+                // Preserve the STORED method of the input entry.
+                if (entry.getMethod() == JarEntry.STORED) {
+                    newEntry = new JarEntry(entry);
+                } else {
+                    // Create a new entry so that the compressed len is recomputed.
+                    newEntry = new JarEntry(name);
+                }
+
+                writeEntry(output, zis, newEntry, messageDigest, manifest, base64Encoder, digestAttr);
+
+                zis.closeEntry();
+           }
+        } finally {
+            zis.close();
+        }
+    }
+
+    private static void writeEntry(JarOutputStream output, InputStream input, JarEntry entry, 
+        MessageDigest digest, Manifest manifest, Base64.Encoder encoder, String digestAttr) throws IOException {
+        output.putNextEntry(entry);
+
+        // Write input stream to the jar output.
+        int count;
+        while ((count = input.read(buffer)) != -1) {
+            output.write(buffer, 0, count);
+            if (digest != null) digest.update(buffer, 0, count);
+        }
+
+        output.closeEntry();
+
+        if (manifest != null) {
+            Attributes attr = manifest.getAttributes(entry.getName());
+            if (attr == null) {
+                attr = new Attributes();
+                manifest.getEntries().put(entry.getName(), attr);
+            }
+            attr.putValue(digestAttr, encoder.encodeToString(digest.digest()));
+        }
+    }  
 }