summaryrefslogtreecommitdiff
path: root/keymanager
diff options
context:
space:
mode:
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/changes/bug-7410_fetch_key1
-rw-r--r--keymanager/src/leap/keymanager/__init__.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/keymanager/changes/bug-7410_fetch_key b/keymanager/changes/bug-7410_fetch_key
new file mode 100644
index 00000000..4aec9fe7
--- /dev/null
+++ b/keymanager/changes/bug-7410_fetch_key
@@ -0,0 +1 @@
+- catch request exceptions on key fetching
diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py
index 5248cb0f..e378c91f 100644
--- a/keymanager/src/leap/keymanager/__init__.py
+++ b/keymanager/src/leap/keymanager/__init__.py
@@ -820,7 +820,11 @@ class KeyManager(object):
self._assert_supported_key_type(ktype)
logger.info("Fetch key for %s from %s" % (address, uri))
- res = self._get_with_combined_ca_bundle(uri)
+ try:
+ res = self._get_with_combined_ca_bundle(uri)
+ except Exception as e:
+ logger.warning("There was a problem fetching key: %s" % (e,))
+ return defer.fail(KeyNotFound(uri))
if not res.ok:
return defer.fail(KeyNotFound(uri))