summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug-4364_send-keys-whenever-keymanager-inits2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug-4364_send-keys-whenever-keymanager-inits b/changes/bug-4364_send-keys-whenever-keymanager-inits
new file mode 100644
index 00000000..0c3f6187
--- /dev/null
+++ b/changes/bug-4364_send-keys-whenever-keymanager-inits
@@ -0,0 +1,2 @@
+ o Send user's key to nickserver whenever keymanager is initialized. Closes
+ #4364.
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index b046d279..70318ab8 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -375,6 +375,8 @@ class SoledadBootstrapper(AbstractBootstrapper):
api_version=self._provider_config.get_api_version(),
uid=srp_auth.get_uid(),
gpgbinary=self._get_gpg_bin_path())
+ # make sure key is in server
+ self._keymanager.send_key(openpgp.OpenPGPKey)
def _gen_key(self, _):
"""
@@ -401,7 +403,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
try:
self._keymanager.gen_key(openpgp.OpenPGPKey)
except Exception as exc:
- logger.error("error while generating key!")
+ logger.error("Error while generating key!")
logger.exception(exc)
raise
@@ -409,7 +411,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
try:
self._keymanager.send_key(openpgp.OpenPGPKey)
except Exception as exc:
- logger.error("error while sending key!")
+ logger.error("Error while sending key!")
logger.exception(exc)
raise