Added openpgp key generation.

- Not yet usable because of API incompatibilities
 - (needs upgrade of LEAP python deps to latest version)

2 files changed, 40 insertions, 6 deletions

diff --git a/service/app/bitmask_libraries/nicknym.py b/service/app/bitmask_libraries/nicknym.py
index 5d9c5308..8f5f06d1 100644
--- a/service/app/bitmask_libraries/nicknym.py
+++ b/service/app/bitmask_libraries/nicknym.py
@@ -1,18 +1,38 @@
-from leap.keymanager import KeyManager
+from leap.keymanager import KeyManager, openpgp, KeyNotFound
 from .certs import which_bundle
 
-SOLEDAD_CERT = '/tmp/ca.crt'
-
 
 class NickNym(object):
-
     def __init__(self, provider, config, soledad_session, srp_session):
         nicknym_url = _discover_nicknym_server(provider)
-        self.keymanager = KeyManager('%s@%s' % (srp_session.user_name, provider.domain), nicknym_url, soledad_session.soledad,
+        self._email = '%s@%s' % (srp_session.user_name, provider.domain)
+        self.keymanager = KeyManager('%s@%s' % (srp_session.user_name, provider.domain), nicknym_url,
+                                     soledad_session.soledad,
                                      srp_session.session_id, which_bundle(provider), provider.api_uri,
                                      provider.api_version,
                                      srp_session.uuid, config.gpg_binary)
 
+    def generate_openpgp_key(self):
+        if not self._key_exists(self._email):
+            self._gen_key()
+            self._send_key_to_leap()
+
+    def _key_exists(self, email):
+        try:
+            self.keymanager.get_key(email, openpgp.OpenPGPKey, private=True, fetch_remote=False)
+            return True
+        except KeyNotFound:
+            return False
+
+    def _gen_key(self):
+        self.keymanager.gen_key(openpgp.OpenPGPKey)
+
+    def _send_key_to_leap(self):
+        if True:
+            raise NotImplementedError(
+                'No key sent to leap provider. Reason: leap.keymanager.KeyManager.send_key in latest python module is not compatible with latest LEAP provider')
+        self.keymanager.send_key(openpgp.OpenPGPKey)
+
 
 def _discover_nicknym_server(provider):
-        return 'https://nicknym.%s:6425/' % provider.domain
+    return 'https://nicknym.%s:6425/' % provider.domain
diff --git a/service/test/bitmask_libraries/nicknym_test.py b/service/test/bitmask_libraries/nicknym_test.py
index a087874a..46c70371 100644
--- a/service/test/bitmask_libraries/nicknym_test.py
+++ b/service/test/bitmask_libraries/nicknym_test.py
@@ -1,5 +1,6 @@
 from mock import patch
 
+from leap.keymanager import openpgp, KeyNotFound
 from app.bitmask_libraries.nicknym import NickNym
 from abstract_leap_test import AbstractLeapTest
 
@@ -17,3 +18,16 @@ class NickNymTest(AbstractLeapTest):
                                      self.soledad, self.session_id, '/some/path/to/ca_cert',
                                      'https://api.some-server.test:4430', '1', self.uuid,
                                      '/path/to/gpg')
+
+    @patch('app.bitmask_libraries.nicknym.KeyManager')
+    def test_gen_key(self, keymanager_mock):
+        #given
+        keyman = keymanager_mock.return_value
+        keyman.get_key.side_effect = KeyNotFound
+        nicknym = NickNym(self.provider, self.config, self.soledad_session, self.srp_session)
+
+        #when/then
+        self.assertRaises(NotImplementedError, nicknym.generate_openpgp_key)
+
+        keyman.get_key.assert_called_with('test_user@some-server.test', openpgp.OpenPGPKey, fetch_remote=False, private=True)
+        keyman.gen_key.assert_called_with(openpgp.OpenPGPKey)