support issuing new client certificates

wg · wg · commit 2bbfea5b2a4e · 2013-09-01T15:27:34.000+09:00
diff --git a/keys.app/AndroidManifest.xml b/keys.app/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.lambdaworks.keys"
-          android:versionCode="1"
-          android:versionName="1.0.0">
-  <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="16"/>
+          android:versionCode="2"
+          android:versionName="1.0.1">
+  <uses-sdk android:targetSdkVersion="18" android:minSdkVersion="16"/>
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -27,6 +27,8 @@
 
     <activity android:name=".InitActivity"/>
     <activity android:name=".ReadyActivity"/>
+    <activity android:name=".IssueActivity" />
+    <activity android:name=".ManageActivity" android:parentActivityName=".KeysActivity"/>
     <activity android:name=".SettingsActivity" android:parentActivityName=".KeysActivity"/>
     <activity android:name=".WebViewActivity"/>
 
diff --git a/keys.app/res/layout/cert.xml b/keys.app/res/layout/cert.xml
@@ -30,7 +30,7 @@
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:layout_alignParentBottom="true"
-                  android:orientation="horizontal"
+                  android:orientation="vertical"
                   android:gravity="center">
         <Button android:id="@+id/ok"
                 style="?android:attr/borderlessButtonStyle"
diff --git a/keys.app/res/layout/issue.xml b/keys.app/res/layout/issue.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/issue"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginTop="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginBottom="10dp"
+            android:columnCount="2">
+    <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:text="@string/certIssued"
+            />
+    <fragment
+            android:tag="cert"
+            android:name="com.lambdaworks.keys.CertFragment"
+            android:layout_below="@id/text"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+</RelativeLayout>
+
diff --git a/keys.app/res/menu/main.xml b/keys.app/res/menu/main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/manage" android:title="@string/certs"/>
   <item android:id="@+id/settings" android:title="@string/settings"/>
 </menu>
diff --git a/keys.app/res/values/strings.xml b/keys.app/res/values/strings.xml
@@ -20,11 +20,18 @@
     <string name="sampleCert">
         -----BEGIN EC PARAMETERS-----\nBgUrgQQAIg==\n-----END EC PARAMETERS-----\n-----BEGIN PRIVATE KEY-----\nMIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAJ3adw8P6wq9SL4BXK\nzvKc0gU6L15a8+zfHNgCs9elqj5jms1pzkIvgCjzGOfkyhmhZANiAARhdfA1Bf0I\nRQZQdCFBoz68rPWoG0Sb3iya+YuF7IL6HOVUlvNv+WdekYRvo0SZhDeZd1qSMqrA\nhg7MY6RKMK3HhTua3t4U4Loa6t4y3nc6k/5X3ECNI54kJg4h3Ku9nX0=\n-----END PRIVATE KEY-----\n-----BEGIN CERTIFICATE-----\nMIIBnTCCASOgAwIBAgIIELsXGyuMbfwwCgYIKoZIzj0EAwMwGTEXMBUGA1UEAxMO\nS2V5cyBDQS9TZXJ2ZXIwHhcNMTMwMzEwMDYwOTI0WhcNMjMwMzA4MDYwOTI0WjAZ\nMRcwFQYDVQQDEw5LZXlzIENBL1NlcnZlcjB2MBAGByqGSM49AgEGBSuBBAAiA2IA\nBKlSKl56Lpx+jlEDrwkfcTBtUMP/TL9/EsV65NgqTkmVLMe+c3bQcs2jQhUUSBfh\n5Asvq/HwsEXGDz5BZTuZkzVGM974bKLiTBSTORimk+HEVTGhZxh3Kki272KGDSS8\n5KM4MDYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwEwYDVR0lBAww\nCgYIKwYBBQUHAwEwCgYIKoZIzj0EAwMDaAAwZQIxAMZrLjBa3YWMEDEgWefs+zhz\nj0Z24XBuIVMGygNTFDCakQK3qwS89UWoTuywsUJDtAIweGXqSK7KFPeSPX+SozEQ\nBLRrCwW0TOgH8kheQgmiefYyWGSvzoPHHI4JDfuUVk89\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBlzCCAR2gAwIBAgIIbYcsRMFwMUAwCgYIKoZIzj0EAwMwGTEXMBUGA1UEAxMO\nS2V5cyBDQS9TZXJ2ZXIwHhcNMTMwMzEwMDYwOTI0WhcNMjMwMzA4MDYwOTI0WjAW\nMRQwEgYDVQQDEwtLZXlzIENsaWVudDB2MBAGByqGSM49AgEGBSuBBAAiA2IABGF1\n8DUF/QhFBlB0IUGjPrys9agbRJveLJr5i4Xsgvoc5VSW82/5Z16RhG+jRJmEN5l3\nWpIyqsCGDsxjpEowrceFO5re3hTguhrq3jLedzqT/lfcQI0jniQmDiHcq72dfaM1\nMDMwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYB\nBQUHAwIwCgYIKoZIzj0EAwMDaAAwZQIxAL4OOsbjy7hIebdP8hbGh/hVVNp5+eu1\nHgIVS6/Xx/kwfvB86VcmJizAVQSF5jNj6gIwUhkOLAH5WEQoTewfkdmrR80wBO/1\nRy+KyYonl89rrNLt60AycHsl0IQ6tRSVvRCj\n-----END CERTIFICATE-----\n
     </string>
+    <string name="certIssued">
+        Certificate generation complete. The following X.509 client certificate may be used to
+        access the keys server on this device.
+    </string>
     <string name="password">Password</string>
     <string name="copy">Copy to SD Card</string>
     <string name="ok">OK</string>
     <string name="certCopied">Cert copied to %s</string>
     <string name="serverActive">Keys server active</string>
+    <string name="certs">Certificates</string>
+    <string name="issue">Issue Certificate</string>
+    <string name="issueSummary">Issue new client certificate</string>
     <string name="certificate">Certificate</string>
     <string name="settings">Settings</string>
     <string name="source">https://github.com/wg/keys</string>
@@ -37,4 +44,5 @@
     </string>
     <string name="send">Send</string>
     <string name="initializing">Initializing database</string>
+    <string name="generating">Generating certificate</string>
 </resources>
diff --git a/keys.app/res/xml/manage.xml b/keys.app/res/xml/manage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+  <PreferenceCategory android:key="certificates" android:title="@string/certs">
+    <Preference android:key="issue" android:title="@string/issue" android:summary="@string/issueSummary"/>
+  </PreferenceCategory>
+</PreferenceScreen>
diff --git a/keys.app/src/com/lambdaworks/keys/IssueActivity.java b/keys.app/src/com/lambdaworks/keys/IssueActivity.java
@@ -0,0 +1,19 @@
+// Copyright (C) 2013 - Will Glozer. All rights reserved.
+
+package com.lambdaworks.keys;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+
+public class IssueActivity extends Activity {
+    public void onCreate(Bundle state) {
+        super.onCreate(state);
+        setContentView(R.layout.issue);
+        setTitle(getString(R.string.certificate));
+
+        String cert = getIntent().getStringExtra("cert");
+        CertFragment fragment = (CertFragment) getFragmentManager().findFragmentByTag("cert");
+        fragment.setCert(cert);
+    }
+}
diff --git a/keys.app/src/com/lambdaworks/keys/KeysActivity.java b/keys.app/src/com/lambdaworks/keys/KeysActivity.java
@@ -63,6 +63,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.manage:
+                startActivity(new Intent(this, ManageActivity.class));
+                break;
             case R.id.settings:
                 startActivity(new Intent(this, SettingsActivity.class));
                 break;
diff --git a/keys.app/src/com/lambdaworks/keys/KeysCore.java b/keys.app/src/com/lambdaworks/keys/KeysCore.java
@@ -15,7 +15,13 @@ public static File databaseDir(Context context) {
         return new File(context.getFilesDir(), "db");
     }
 
+    public static String issueCert(Context context) {
+        String path = databaseDir(context).getAbsolutePath();
+        return issueCert(path);
+    }
+
     public static native String initialize(String path, long N, long r, long p);
     public static native NetworkInterface[] interfaces();
+    public static native String issueCert(String path);
     public static native Version version();
 }
diff --git a/keys.app/src/com/lambdaworks/keys/ManageActivity.java b/keys.app/src/com/lambdaworks/keys/ManageActivity.java
@@ -0,0 +1,15 @@
+// Copyright (C) 2013 - Will Glozer. All rights reserved.
+
+package com.lambdaworks.keys;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ManageActivity extends Activity {
+    @Override
+    public void onCreate(Bundle state) {
+        super.onCreate(state);
+        ManageFragment settings = new ManageFragment();
+        getFragmentManager().beginTransaction().replace(android.R.id.content, settings).commit();
+    }
+}
diff --git a/keys.app/src/com/lambdaworks/keys/ManageFragment.java b/keys.app/src/com/lambdaworks/keys/ManageFragment.java
@@ -0,0 +1,54 @@
+// Copyright (C) 2013 - Will Glozer. All rights reserved.
+
+package com.lambdaworks.keys;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.text.Html;
+import android.util.Log;
+
+public class ManageFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener {
+    @Override
+    public void onCreate(Bundle state) {
+        super.onCreate(state);
+        addPreferencesFromResource(R.xml.manage);
+        getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
+        PreferenceScreen screen = getPreferenceScreen();
+        screen.findPreference("issue").setOnPreferenceClickListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        String key = preference.getKey();
+        if ("issue".equals(key)) {
+            new IssueCertTask().execute();
+        }
+        return true;
+    }
+
+    private class IssueCertTask extends ProgressTask<Void, Void, String> {
+        public IssueCertTask() {
+            super(getActivity(), R.string.generating);
+        }
+
+        @Override
+        protected String doInBackground(Void... voids) {
+            return KeysCore.issueCert(getActivity());
+        }
+
+        @Override
+        protected void onPostExecute(String cert) {
+            super.onPostExecute(cert);
+            Intent intent = new Intent(getActivity(), IssueActivity.class);
+            intent.putExtra("cert", cert);
+            startActivity(intent);
+        }
+    }
+}
diff --git a/keys.app/src/com/lambdaworks/keys/ProgressTask.java b/keys.app/src/com/lambdaworks/keys/ProgressTask.java
@@ -12,6 +12,7 @@ public abstract class ProgressTask<Params, Progress, Result> extends AsyncTask<P
     protected ProgressTask(Context context, int message) {
         dialog = new ProgressDialog(context);
         dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        dialog.setCancelable(false);
         dialog.setMessage(context.getString(message));
     }
 
diff --git a/src/android/native.c b/src/android/native.c
@@ -109,6 +109,41 @@ jobjectArray JNICALL interfaces(JNIEnv *env, jclass cls) {
     return array;
 }
 
+jstring JNICALL issue_cert(JNIEnv *env, jclass cls, jstring path) {
+    EVP_PKEY *ik, *pk;
+    X509 *issuer, *cert;
+    char pem[PATH_MAX];
+    jstring str;
+
+    const char *chars = (*env)->GetStringUTFChars(env, path, 0);
+    snprintf(pem, PATH_MAX, "%s/server.pem", chars);
+    (*env)->ReleaseStringUTFChars(env, path, chars);
+
+    read_pem(pem, NULL, NULL, &ik, 1, &issuer);
+
+    if (issue_client_cert(issuer, ik, &cert, &pk)) {
+        BIO *out = BIO_new(BIO_s_mem());
+        PEM_write_bio_PKCS8PrivateKey(out, pk, NULL, NULL, 0, NULL, NULL);
+        PEM_write_bio_X509(out, issuer);
+        PEM_write_bio_X509(out, cert);
+        BIO_write(out, "\0", 1);
+
+        BIO_get_mem_data(out, &chars);
+        str = (*env)->NewStringUTF(env, chars);
+        BIO_free(out);
+    } else {
+        jclass e = (*env)->FindClass(env, "java/lang/IllegalStateException");
+        (*env)->ThrowNew(env, e, "Cert issue failed");
+    }
+
+    EVP_PKEY_free(ik);
+    EVP_PKEY_free(pk);
+    X509_free(issuer);
+    X509_free(cert);
+
+    return str;
+}
+
 jobject JNICALL version(JNIEnv *env, jclass cls) {
     cls = (*env)->FindClass(env, "com/lambdaworks/keys/Version");
     jstring openssl = (*env)->NewStringUTF(env, OPENSSL_VERSION_TEXT);
@@ -119,6 +154,7 @@ jobject JNICALL version(JNIEnv *env, jclass cls) {
 static const JNINativeMethod core_methods[] = {
     { "initialize", "(Ljava/lang/String;JJJ)Ljava/lang/String;",  (void *) initialize },
     { "interfaces", "()[Lcom/lambdaworks/keys/NetworkInterface;", (void *) interfaces },
+    { "issueCert",  "(Ljava/lang/String;)Ljava/lang/String;",     (void *) issue_cert },
     { "version",    "()Lcom/lambdaworks/keys/Version;",           (void *) version    },
 };
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,13 @@ public static File databaseDir(Context context) {`
`15`	`15`	`return new File(context.getFilesDir(), "db");`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ public static String issueCert(Context context) {`
	`19`	`+ String path = databaseDir(context).getAbsolutePath();`
	`20`	`+ return issueCert(path);`
	`21`	`+ }`
	`22`	`+`
`18`	`23`	`public static native String initialize(String path, long N, long r, long p);`
`19`	`24`	`public static native NetworkInterface[] interfaces();`
	`25`	`+ public static native String issueCert(String path);`
`20`	`26`	`public static native Version version();`
`21`	`27`	`}`