Merge pull request #24 from peppelinux/master

cookie dealer

Author: rohe

src/oidcendpoint/cookie.py

@@ -14,7 +14,7 @@
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.jwk import key_from_jwk_dict
 from cryptojwt.jws.hmac import HMACSigner
-from cryptojwt.key_bundle import init_key
+from cryptojwt.key_bundle import init_key, import_jwk
 from cryptojwt.utils import as_bytes
 from cryptojwt.utils import as_unicode
 from cryptojwt.utils import b64e
@@ -301,7 +301,10 @@ def __init__(
             else:
                 self.sign_key = SYMKey(k=sign_key)
         elif sign_jwk:
-            self.sign_key = init_key(**sign_jwk)
+            if isinstance(sign_jwk, dict):
+                self.sign_key = init_key(**sign_jwk)
+            else:
+                self.sign_key = import_jwk(sign_jwk)
         else:
             self.sign_key = None
 
@@ -313,7 +316,10 @@ def __init__(
             else:
                 self.enc_key = SYMKey(k=enc_key)
         elif enc_jwk:
-            self.enc_key = init_key(**enc_jwk)
+            if isinstance(enc_jwk, dict):
+                self.enc_key = init_key(**enc_jwk)
+            else:
+                self.enc_key = import_jwk(enc_jwk)
         else:
             self.enc_key = None
 

src/oidcendpoint/oidc/session.py

@@ -381,11 +381,8 @@ def do_verified_logout(self, sid, client_id, alla=False, **kwargs):
         else:
             _res = self.logout_from_client(sid=sid, client_id=client_id)
 
-        try:
-            bcl = _res["blu"]
-        except KeyError:
-            pass
-        else:
+        bcl = _res.get("blu")
+        if bcl:
             # take care of Back channel logout first
             for _cid, spec in bcl.items():
                 _url, sjwt = spec
@@ -404,10 +401,7 @@ def do_verified_logout(self, sid, client_id, alla=False, **kwargs):
                 elif res.status_code >= 400:
                     logger.info("failed to logout from {}".format(_cid))
 
-        try:
-            return _res["flu"].values()
-        except KeyError:
-            return []
+        return _res["flu"].values() if _res.get("fluu") else []
 
     def kill_cookies(self):
         _ec = self.endpoint_context