Merge "Add new error for invalid response"

keystoneclient/auth/identity/base.py

@@ -58,6 +58,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
         when invoked. If you are looking to just retrieve the current auth
         data then you should use get_access.
 
+        :raises InvalidResponse: The response returned wasn't appropriate.
         :raises HttpError: An error from an invalid HTTP response.
 
         :returns AccessInfo: Token access information.

keystoneclient/auth/identity/v2.py

@@ -84,7 +84,13 @@ class Auth(base.BaseIdentityPlugin):
 
         resp = session.post(url, json=params, headers=headers,
                             authenticated=False)
-        return access.AccessInfoV2(**resp.json()['access'])
+
+        try:
+            resp_data = resp.json()['access']
+        except (KeyError, ValueError):
+            raise exceptions.InvalidResponse(response=resp)
+
+        return access.AccessInfoV2(**resp_data)
 
     @abc.abstractmethod
     def get_auth_data(self, headers=None):

keystoneclient/auth/identity/v3.py

@@ -108,8 +108,14 @@ class Auth(base.BaseIdentityPlugin):
 
         resp = session.post(self.token_url, json=body, headers=headers,
                             authenticated=False)
+
+        try:
+            resp_data = resp.json()['token']
+        except (KeyError, ValueError):
+            raise exceptions.InvalidResponse(response=resp)
+
         return access.AccessInfoV3(resp.headers['X-Subject-Token'],
-                                   **resp.json()['token'])
+                                   **resp_data)
 
     @staticmethod
     def _factory(auth_url, **kwargs):

keystoneclient/exceptions.py

@@ -61,3 +61,11 @@ class MissingAuthPlugin(ClientException):
 class NoMatchingPlugin(ClientException):
     """There were no auth plugins that could be created from the parameters
     provided."""
+
+
+class InvalidResponse(ClientException):
+    """The response from the server is not valid for this request."""
+
+    def __init__(self, response):
+        super(InvalidResponse, self).__init__()
+        self.response = response