Merge pull request #23 from peppelinux/master

better create_session_db args handling

Author: rohe

src/oidcendpoint/endpoint.py

@@ -201,15 +201,9 @@ def parse_request(self, request, auth=None, **kwargs):
                 req["client_id"] = auth_info["client_id"]
                 _client_id = auth_info["client_id"]
             else:
-                try:
-                    _client_id = req["client_id"]
-                except KeyError:
-                    pass
+                _client_id = req.get("client_id")
 
-        try:
-            keyjar = self.endpoint_context.keyjar
-        except AttributeError:
-            keyjar = ""
+        keyjar = getattr(self, "endpoint_context", "")
 
         # verify that the request message is correct
         try:

src/oidcendpoint/oidc/registration.py

@@ -150,7 +150,6 @@ def match_client_request(self, request):
     def do_client_registration(self, request, client_id, ignore=None):
         if ignore is None:
             ignore = []
-
         _context = self.endpoint_context
         _cinfo = _context.cdb[client_id].copy()
         logger.debug("_cinfo: %s" % sanitize(_cinfo))
@@ -344,7 +343,7 @@ def add_registration_api(self, cinfo, client_id, context):
     def add_client_secret(self, cinfo, client_id, context):
         delta_int = int(self.kwargs.get("client_secret_expiration_time",
                                         0))
-        args = {"delta": delta_int} if delta_int else {}        
+        args = {"delta": delta_int} if delta_int else {}
         client_secret = secret(context.seed, client_id)
         cinfo.update(
             {
@@ -395,7 +394,7 @@ def client_registration_setup(self, request, new_id=True, set_secret=True):
         client_secret = ""
         if set_secret:
             client_secret = self.add_client_secret(_cinfo, client_id,
-                                                   _context)            
+                                                   _context)
 
         _context.cdb[client_id] = _cinfo
         _cinfo = self.do_client_registration(

src/oidcendpoint/session.py

@@ -162,7 +162,8 @@ def __delitem__(self, key):
     def keys(self):
         return self._db.keys()
 
-    def create_authz_session(self, authn_event, areq, client_id="", uid="", **kwargs):
+    def create_authz_session(self, authn_event, areq,
+                             client_id="", uid="", **kwargs):
         """
 
         :param authn_event:
@@ -293,20 +294,14 @@ def replace_token(self, sid, sinfo, token_type):
         :param token_type: What type of tokens should be replaced
         :return: Updated session info
         """
-        try:
-            # Mint a new one
+
+        if token_type in self.handler:
             refresh_token = self.handler[token_type](sid, sinfo=sinfo)
-        except KeyError:
-            pass
-        else:
             # blacklist the old is there is one
-            try:
+            if sinfo.get(token_type):
                 self.handler[token_type].black_list(sinfo[token_type])
-            except KeyError:
-                pass
 
             sinfo[token_type] = refresh_token
-
         return sinfo
 
     def _make_at(self, sid, session_info, aud=None, client_id_aud=True):
@@ -561,11 +556,8 @@ def get_authentication_event(self, sid):
         except Exception:
             raise UnknownToken(sid)
         else:
-            try:
-                return session_info["authn_event"]
-            except KeyError:
-                raise ValueError("No Authn event info")
-
+            sesinf = session_info.get("authn_event")
+            return sesinf or ValueError("No Authn event info")
 
 def create_session_db(ec, token_handler_args, db=None,
                       sso_db=None, sub_func=None):

src/oidcendpoint/sso_db.py

@@ -23,7 +23,7 @@ def __init__(self, db=None):
         self._db = db or InMemoryDataBase()
 
     def set(self, label, key, value):
-        logger.debug("SSODb set {}: {}".format(key, value))
+        logger.debug("SSODb set {} - {}: {}".format(label, key, value))
         _key = KEY_FORMAT.format(label, key)
         _values = self._db.get(_key)
         if not _values: