Merge branch 'master' of github.com:IdentityPython/oidcmsg

Author: rohe

src/oidcmsg/key_jar.py

@@ -897,7 +897,7 @@ def public_keys_keyjar(from_kj, origin, to_kj=None, receiver=''):
     return to_kj
 
 
-def init_key_jar(public_path, private_path='', key_defs=''):
+def init_key_jar(public_path, private_path='', key_defs='', iss=''):
     """
     If a JWKS with private keys exists create a KeyJar from it.
     If not, then a set of keys are created based on the keydefs specification.
@@ -911,6 +911,7 @@ def init_key_jar(public_path, private_path='', key_defs=''):
         private keys.
     :param key_defs: A definition of what keys should be created if they are
         not already available
+    :param iss: Issuer ID
     :return: An instantiated :py:class;`oidcmsg.key_jar.KeyJar` instance
     """
 
@@ -934,9 +935,16 @@ def init_key_jar(public_path, private_path='', key_defs=''):
             fp = open(public_path, 'w')
             fp.write(json.dumps(jwks))
             fp.close()
+
+            if iss:
+                _kj.import_jwks(jwks, iss)
+
     else:
         _jwks = open(public_path, 'r').read()
         _kj = KeyJar()
         _kj.import_jwks(json.loads(_jwks), '')
 
+        if iss:
+            _kj.import_jwks(json.loads(_jwks), iss)
+
     return _kj

src/oidcmsg/oauth2/__init__.py

@@ -15,6 +15,13 @@
 logger = logging.getLogger(__name__)
 
 
+def is_error_message(msg):
+    if 'error' in msg:
+        return True
+    else:
+        return False
+
+
 class ResponseMessage(Message):
     """
     The basic error response
@@ -23,12 +30,6 @@ class ResponseMessage(Message):
                "error_description": SINGLE_OPTIONAL_STRING,
                "error_uri": SINGLE_OPTIONAL_STRING}
 
-    def is_error_message(self):
-        if 'error' in self:
-            return True
-        else:
-            return False
-
 
 class AuthorizationErrorResponse(ResponseMessage):
     """

tests/test_5_oauth2.py

@@ -14,6 +14,7 @@
 from oidcmsg.message import sp_sep_list_deserializer
 
 from oidcmsg.oauth2 import factory
+from oidcmsg.oauth2 import is_error_message
 from oidcmsg.oauth2 import AccessTokenRequest
 from oidcmsg.oauth2 import AccessTokenResponse
 from oidcmsg.oauth2 import AuthorizationErrorResponse
@@ -508,12 +509,12 @@ def test_error_message(self):
         assert ue_str != ueo_str
         assert "error_message" not in ueo_str
         assert "error_message" in ue_str
-        assert err.is_error_message()
+        assert is_error_message(err)
 
     def test_auth_error_message(self):
         resp = AuthorizationResponse(error="invalid_request",
                                      error_description="Something was missing")
-        assert resp.is_error_message()
+        assert is_error_message(resp)
 
 
 def test_factory():