[bug] handle 503 responses from nyckserver

This can be produced by errors fetching keys from the server.

- Resolves: #8971

2 files changed, 12 insertions, 5 deletions

diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py
index 2dd0d336..bc0c2185 100644
--- a/src/leap/bitmask/keymanager/__init__.py
+++ b/src/leap/bitmask/keymanager/__init__.py
@@ -214,10 +214,12 @@ class KeyManager(object):
             if (domain == _get_domain(self._nickserver_uri)):
                 validation_level = ValidationLevels.Provider_Trust
 
-        yield self.put_raw_key(
-            server_keys[self.OPENPGP_KEY],
-            address=address,
-            validation=validation_level)
+            yield self.put_raw_key(
+                server_keys[self.OPENPGP_KEY],
+                address=address,
+                validation=validation_level)
+        else:
+            raise KeyNotFound("No openpgp key found")
 
     def get_key(self, address, private=False, fetch_remote=True):
         """
diff --git a/src/leap/bitmask/keymanager/nicknym.py b/src/leap/bitmask/keymanager/nicknym.py
index b585d112..cbc4e25d 100644
--- a/src/leap/bitmask/keymanager/nicknym.py
+++ b/src/leap/bitmask/keymanager/nicknym.py
@@ -22,7 +22,7 @@ import urllib
 from twisted.internet import defer
 from twisted.logger import Logger
 from twisted.web import client
-from twisted.web._responses import NOT_FOUND, SERVICE_UNAVAILABLE
+from twisted.web._responses import NOT_FOUND, SERVICE_UNAVAILABLE, BAD_GATEWAY
 
 from leap.bitmask.keymanager.errors import KeyNotFound
 from leap.common.check import leap_assert
@@ -146,6 +146,11 @@ class Nicknym(object):
                           'Request: %s' % (response.code, uri)
                 self.log.warn(message)
                 raise KeyNotFound(message), None, sys.exc_info()[2]
+            if response.code == BAD_GATEWAY:
+                message = ' %s: Bad gateway. Request: %s. Response: %s' \
+                          % (response.code, uri, response)
+                self.log.warn(message)
+                raise KeyNotFound(message), None, sys.exc_info()[2]
             return response
 
         d = self._async_client_pinned.request(str(uri), 'GET',