Finish KeyStore manager GUI and signing logic

Author: imilka

src/processing/mode/android/AndroidBuild.java

@@ -34,7 +34,6 @@
 import processing.core.PApplet;
 import processing.mode.java.JavaBuild;
 import sun.security.tools.JarSigner;
-import sun.security.tools.KeyTool;
 
 import java.io.*;
 
@@ -275,37 +274,33 @@ public File exportProject() throws IOException, SketchException {
     return null;
   }
 
-  public File exportPackage() throws Exception {
+  public File exportPackage(String keyStorePassword) throws Exception {
     File projectFolder = build("release");
     if(projectFolder == null) return null;
 
-    File signedPackage = signPackage(projectFolder);
+    File signedPackage = signPackage(projectFolder, keyStorePassword);
     if(signedPackage == null) return null;
 
     File exportFolder = createExportFolder();
     Base.copyDir(projectFolder, exportFolder);
     return new File(exportFolder, "/bin/");
   }
 
-  private File signPackage(File projectFolder) throws Exception {
-    File keyStore = getKeyStore();
+  private File signPackage(File projectFolder, String keyStorePassword) throws Exception {
+    File keyStore = AndroidKeyStore.getKeyStore();
     if(keyStore == null) return null;
 
     File unsignedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-unsigned.apk");
     if(!unsignedPackage.exists()) return null;
 
-    // NOT sure that works: java.home returns JRE path here, need to walk back to ../../bin to find jarsigner
-    // TODO receive generated password here
-    String password = "generatedpasswordhere";
-
     String[] args = {
         "-sigalg", "SHA1withRSA",
         "-digestalg", "SHA1",
-        "-keypass", password,
-        "-storepass", password,
+        "-keypass", keyStorePassword,
+        "-storepass", keyStorePassword,
         "-keystore", keyStore.getCanonicalPath(),
         unsignedPackage.getCanonicalPath(),
-        sketch.getName()
+        AndroidKeyStore.ALIAS_STRING
     };
 
     // TODO remove hardcoded tools.jar path from build.xml
@@ -363,51 +358,6 @@ private boolean verifySignedPackage(File signedPackage) throws IOException, Inte
     return false;
   }
 
-  private File getKeyStore() throws Exception {
-    File keyStoreFolder = new File(sketch.getFolder(), "keystore");
-    if(!keyStoreFolder.exists()) {
-      boolean result = keyStoreFolder.mkdirs();
-
-      if(!result) {
-        Base.showWarning("Folders, folders, folders",
-            "Could not create the necessary folders to build.\n" +
-                "Perhaps you have some file permissions to sort out?", null);
-        return null;
-      }
-    }
-
-    File keyStore = new File(keyStoreFolder, sketch.getName() + "-release-key.keystore");
-    if(!keyStore.exists()) {
-      String dname = "CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, S=Unknown, C=Unknown";
-      // TODO Generate password and store it with alias in some accessible place
-      String password = "generatedpasswordhere";
-
-      String[] args = {
-          "-genkey",
-          "-keystore", keyStore.getCanonicalPath(),
-          "-alias", sketch.getName(),
-          "-keyalg", "RSA",
-          "-keysize", "2048",
-          "-validity", "10000",
-          "-keypass", password,
-          "-storepass", password,
-          "-dname", dname
-      };
-
-      KeyTool.main(args);
-
-      // any better ways to check if it is created now?
-      keyStore = new File(keyStore.getCanonicalPath());
-      if(!keyStore.exists()) {
-        Base.showWarning("Failed to create key store",
-            "There was an error while creating the key store");
-        return null;
-      }
-    }
-
-    return keyStore;
-  }
-
   /*
   // SDK tools 17 have a problem where 'dex' won't pick up the libs folder
   // (which contains our friend processing-core.jar) unless your current

src/processing/mode/android/AndroidEditor.java

@@ -373,36 +373,37 @@ public void run() {
   public void handleExportPackage() {
     // Need to implement an entire signing setup first
     // http://dev.processing.org/bugs/show_bug.cgi?id=1430
-    deactivateExport();
-    new KeyStoreManager(sketch);
-    /*
-
     if(handleExportCheckModified()) {
-      new Thread() {
-        public void run() {
-          startIndeterminate();
-          statusNotice("Exporting signed package...");
-          AndroidBuild build = new AndroidBuild(sketch, androidMode);
-          try {
-            File projectFolder = build.exportPackage();
-            if(projectFolder != null) {
-              statusNotice("Done with export.");
-              Base.openFolder(projectFolder);
-            } else {
-              statusError("Error with export");
-            }
-          } catch (IOException e) {
-            statusError(e);
-          } catch (SketchException e) {
-            statusError(e);
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          } catch (Exception e) {
-            e.printStackTrace();
+      deactivateExport();
+      new KeyStoreManager(this);
+    }
+  }
+
+  public void startExportPackage(final String keyStorePassword) {
+    new Thread() {
+      public void run() {
+        startIndeterminate();
+        statusNotice("Exporting signed package...");
+        AndroidBuild build = new AndroidBuild(sketch, androidMode);
+        try {
+          File projectFolder = build.exportPackage(keyStorePassword);
+          if(projectFolder != null) {
+            statusNotice("Done with export.");
+            Base.openFolder(projectFolder);
+          } else {
+            statusError("Error with export");
           }
-          stopIndeterminate();
+        } catch (IOException e) {
+          statusError(e);
+        } catch (SketchException e) {
+          statusError(e);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        } catch (Exception e) {
+          e.printStackTrace();
         }
-      }.start();
-    }                */
+        stopIndeterminate();
+      }
+    }.start();
   }
 }

src/processing/mode/android/AndroidKeyStore.java

@@ -0,0 +1,73 @@
+package processing.mode.android;
+
+import processing.app.Base;
+import sun.security.tools.KeyTool;
+
+import java.io.File;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: imilka
+ * Date: 27.05.14
+ * Time: 14:38
+ */
+public class AndroidKeyStore {
+
+  public static final String ALIAS_STRING = "processing-keystore";
+  public static final String KEYSTORE_FILE_NAME = "android-release-key.keystore";
+
+  public static File getKeyStore() {
+    File keyStore = getKeyStoreLocation();
+    if(!keyStore.exists()) return null;
+    return keyStore;
+  }
+
+  public static File getKeyStoreLocation() {
+    File sketchbookFolder = processing.app.Base.getSketchbookFolder();
+    File keyStoreFolder = new File(sketchbookFolder, "keystore");
+    if(!keyStoreFolder.exists()) {
+      boolean result = keyStoreFolder.mkdirs();
+
+      if(!result) {
+        Base.showWarning("Folders, folders, folders",
+            "Could not create the necessary folders to build.\n" +
+                "Perhaps you have some file permissions to sort out?", null);
+        return null;
+      }
+    }
+
+    File keyStore = new File(keyStoreFolder, KEYSTORE_FILE_NAME);
+    return keyStore;
+  }
+
+  public static void generateKeyStore(String password,
+                                      String commonName, String organizationalUnit,
+                                      String organizationName, String locality,
+                                      String state, String country) throws Exception {
+    String dnamePlaceholder = "CN=%s, OU=%s, O=%s, L=%s, S=%s, C=%s";
+    String dname = String.format(dnamePlaceholder,
+        parseDnameField(commonName), parseDnameField(organizationalUnit), parseDnameField(organizationName),
+        parseDnameField(locality), parseDnameField(state), parseDnameField(country));
+
+    String[] args = {
+        "-genkey",
+        "-keystore", getKeyStoreLocation().getAbsolutePath(),
+        "-alias", ALIAS_STRING,
+        "-keyalg", "RSA",
+        "-keysize", "2048",
+        "-validity", "10000",
+        "-keypass", password,
+        "-storepass", password,
+        "-dname", dname
+    };
+
+    KeyTool.main(args);
+
+    if(getKeyStore() == null) throw new Exception();
+  }
+
+  private static String parseDnameField(String content) {
+    if(content == null || content.length() == 0) return "Unknown";
+    else return content;
+  }
+}