9 files changed, 234 insertions, 24 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
index 9027b14..6c29a53 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -10,6 +10,7 @@ import android.support.v7.app.AlertDialog
 import android.view.View
 import java8.util.concurrent.CompletableFuture
 import kotlinx.android.synthetic.main.base.*
+import kotlinx.android.synthetic.main.dialog_encrypt_decrypt_keys.view.*
 import kotlinx.android.synthetic.main.dialog_network_generate.view.*
 import kotlinx.android.synthetic.main.dialog_network_join.view.*
 import kotlinx.android.synthetic.main.page_configure.*
@@ -62,7 +63,10 @@ class ConfigureActivity : BaseActivity() {
         val genDialog = layoutInflater.inflate(R.layout.dialog_network_generate, main_content, false)
         AlertDialog.Builder(this).setTitle(R.string.title_new_network).setView(genDialog)
                 .setPositiveButton(R.string.action_create) { _, _ ->
-                    generateConf(genDialog.new_net_name.text.toString(), genDialog.new_node_name.text.toString())
+                    generateConf(
+                            genDialog.new_net_name.text.toString(),
+                            genDialog.new_node_name.text.toString(),
+                            genDialog.new_passphrase.text.toString())
                 }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
     }
 
@@ -70,7 +74,21 @@ class ConfigureActivity : BaseActivity() {
         joinDialog = layoutInflater.inflate(R.layout.dialog_network_join, main_content, false)
         AlertDialog.Builder(this).setTitle(R.string.title_join_network).setView(joinDialog)
                 .setPositiveButton(R.string.action_join) { _, _ ->
-                    joinNetwork(joinDialog!!.net_name.text.toString(), joinDialog!!.invitation_url.text.toString())
+                    joinNetwork(
+                            joinDialog!!.net_name.text.toString(),
+                            joinDialog!!.invitation_url.text.toString(),
+                            joinDialog!!.join_passphrase.text.toString())
+                }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
+    }
+
+    fun openEncryptDecryptPrivateKeyDialog(@Suppress("UNUSED_PARAMETER") v: View) {
+        val encryptDecryptDialog = layoutInflater.inflate(R.layout.dialog_encrypt_decrypt_keys, main_content, false)
+        AlertDialog.Builder(this).setTitle(R.string.title_private_keys_encryption).setView(encryptDecryptDialog)
+                .setPositiveButton(R.string.action_apply) { _, _ ->
+                    encryptDecryptPrivateKeys(
+                            encryptDecryptDialog!!.enc_dec_net_name.text.toString(),
+                            encryptDecryptDialog.enc_dec_current_passphrase.text.toString(),
+                            encryptDecryptDialog.enc_dec_new_passphrase.text.toString())
                 }.setNegativeButton(R.string.action_cancel, App.dismissAction).show()
     }
 
@@ -80,22 +98,28 @@ class ConfigureActivity : BaseActivity() {
         text_tinc_binary.text = AppPaths.tinc().absolutePath
     }
 
-    private fun generateConf(netName: String, nodeName: String) = execAction(
+    private fun generateConf(netName: String, nodeName: String, passphrase: String? = null) = execAction(
             R.string.message_generating_configuration,
             Tinc.init(netName, nodeName)
-                    .thenCompose { TincApp.removeScripts(netName) })
+                    .thenCompose { TincApp.removeScripts(netName) }
+                    .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) })
 
-    private fun joinNetwork(netName: String, url: String) = execAction(
+    private fun joinNetwork(netName: String, url: String, passphrase: String? = null) = execAction(
             R.string.message_joining_network,
             Tinc.join(netName, url)
                     .thenCompose { TincApp.removeScripts(netName) }
-                    .thenCompose { TincApp.generateIfaceCfg(netName) })
+                    .thenCompose { TincApp.generateIfaceCfg(netName) }
+                    .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) })
+
+    private fun encryptDecryptPrivateKeys(netName: String, currentPassphrase: String, newPassphrase: String) = execAction(
+            R.string.message_encrypting_decrypting_private_keys,
+            TincApp.setPassphrase(netName, currentPassphrase, newPassphrase))
 
     private fun execAction(@StringRes label: Int, action: CompletableFuture<Void>) {
         showProgressDialog(label).let { progressDialog ->
             action
                     .whenComplete { _, _ -> progressDialog.dismiss() }
-                    .thenAccept { notify(R.string.message_network_configuration_created) }
+                    .thenAccept { notify(R.string.message_network_configuration_written) }
                     .exceptionallyAccept { runOnUiThread { showErrorDialog(it.cause!!.localizedMessage) } }
         }
     }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
index 6eb630d..74a059b 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/LaunchActivity.kt
@@ -1,20 +1,28 @@
 package org.pacien.tincapp.activities
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.net.VpnService
 import android.os.Bundle
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
+import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.*
+import org.pacien.tincapp.R
+import org.pacien.tincapp.commands.TincApp
 import org.pacien.tincapp.context.App
 import org.pacien.tincapp.intent.action.ACTION_CONNECT
 import org.pacien.tincapp.intent.action.ACTION_DISCONNECT
 import org.pacien.tincapp.intent.action.TINC_SCHEME
 import org.pacien.tincapp.service.TincVpnService
+import org.pacien.tincapp.utils.PemUtils
+import java.io.FileNotFoundException
 
 /**
  * @author pacien
  */
-class LaunchActivity : Activity() {
+class LaunchActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -26,15 +34,41 @@ class LaunchActivity : Activity() {
     }
 
     override fun onActivityResult(request: Int, result: Int, data: Intent?) {
-        if (result == Activity.RESULT_OK) TincVpnService.startVpn(intent.data.schemeSpecificPart)
-        finish()
+        if (request == PERMISSION_REQUEST_CODE && result == Activity.RESULT_OK) askPassphrase()
     }
 
     private fun requestPerm() = VpnService.prepare(this).let {
         if (it != null)
-            startActivityForResult(it, 0)
+            startActivityForResult(it, PERMISSION_REQUEST_CODE)
         else
-            onActivityResult(0, Activity.RESULT_OK, null)
+            onActivityResult(PERMISSION_REQUEST_CODE, Activity.RESULT_OK, null)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun askPassphrase() {
+        val netName = intent.data.schemeSpecificPart
+
+        if (needPassphrase(netName) && intent.data.fragment == null) {
+            val dialog = layoutInflater.inflate(R.layout.dialog_decrypt_keys, null, false)
+            AlertDialog.Builder(this)
+                    .setTitle(R.string.title_unlock_private_keys).setView(dialog)
+                    .setPositiveButton(R.string.action_unlock) { _, _ -> connect(netName, dialog.passphrase.text.toString()) }
+                    .setNegativeButton(R.string.action_cancel, { _, _ -> finish() })
+                    .show()
+        } else {
+            connect(netName, intent.data.fragment)
+        }
+    }
+
+    private fun needPassphrase(netName: String) = try {
+        TincApp.listPrivateKeys(netName).filter { it.exists() }.any { PemUtils.isEncrypted(PemUtils.read(it)) }
+    } catch (e: FileNotFoundException) {
+        false
+    }