Merge branch 'IdentityPython-master'

Author: peppelinux

src/oidcendpoint/__init__.py

@@ -6,7 +6,7 @@
 except ImportError:
     import random as rnd
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
 
 
 DEF_SIGN_ALG = {

src/oidcendpoint/cookie.py

@@ -14,6 +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, import_jwk
 from cryptojwt.utils import as_bytes
 from cryptojwt.utils import as_unicode
 from cryptojwt.utils import b64e
@@ -105,7 +106,7 @@ def ver_dec_content(parts, sign_key=None, enc_key=None, sign_alg="SHA256"):
         mac = base64.b64decode(b64_mac)
         verifier = HMACSigner(algorithm=sign_alg)
         if verifier.verify(
-            load.encode("utf-8") + timestamp.encode("utf-8"), mac, sign_key.key
+                load.encode("utf-8") + timestamp.encode("utf-8"), mac, sign_key.key
         ):
             return load, timestamp
         else:
@@ -124,9 +125,9 @@ def ver_dec_content(parts, sign_key=None, enc_key=None, sign_alg="SHA256"):
         if len(p) == 3:
             verifier = HMACSigner(algorithm=sign_alg)
             if verifier.verify(
-                load.encode("utf-8") + timestamp.encode("utf-8"),
-                base64.b64decode(p[2]),
-                sign_key.key,
+                    load.encode("utf-8") + timestamp.encode("utf-8"),
+                    base64.b64decode(p[2]),
+                    sign_key.key,
             ):
                 return load, timestamp
         else:
@@ -135,15 +136,15 @@ def ver_dec_content(parts, sign_key=None, enc_key=None, sign_alg="SHA256"):
 
 
 def make_cookie_content(
-    name,
-    load,
-    sign_key,
-    domain=None,
-    path=None,
-    timestamp="",
-    enc_key=None,
-    max_age=0,
-    sign_alg="SHA256",
+        name,
+        load,
+        sign_key,
+        domain=None,
+        path=None,
+        timestamp="",
+        enc_key=None,
+        max_age=0,
+        sign_alg="SHA256",
 ):
     """
     Create and return a cookies content
@@ -196,15 +197,15 @@ def make_cookie_content(
 
 
 def make_cookie(
-    name,
-    payload,
-    sign_key,
-    domain=None,
-    path=None,
-    timestamp="",
-    enc_key=None,
-    max_age=0,
-    sign_alg="SHA256",
+        name,
+        payload,
+        sign_key,
+        domain=None,
+        path=None,
+        timestamp="",
+        enc_key=None,
+        max_age=0,
+        sign_alg="SHA256",
 ):
     content = make_cookie_content(
         name,
@@ -285,13 +286,13 @@ class CookieDealer(object):
     """
 
     def __init__(
-        self,
-        sign_key="",
-        enc_key="",
-        sign_alg="SHA256",
-        default_values=None,
-        sign_jwk="",
-        enc_jwk="",
+            self,
+            sign_key="",
+            enc_key="",
+            sign_alg="SHA256",
+            default_values=None,
+            sign_jwk=None,
+            enc_jwk=None
     ):
 
         if sign_key:
@@ -301,7 +302,7 @@ def __init__(
                 self.sign_key = SYMKey(k=sign_key)
         elif sign_jwk:
             if isinstance(sign_jwk, dict):
-                self.sign_key = import_jwk(sign_jwk['filename'])
+                self.sign_key = init_key(**sign_jwk)
             else:
                 self.sign_key = import_jwk(sign_jwk)
         else:
@@ -316,7 +317,7 @@ def __init__(
                 self.enc_key = SYMKey(k=enc_key)
         elif enc_jwk:
             if isinstance(enc_jwk, dict):
-                self.enc_key = import_jwk(enc_jwk['filename'])
+                self.enc_key = init_key(**enc_jwk)
             else:
                 self.enc_key = import_jwk(enc_jwk)
         else:
@@ -417,15 +418,15 @@ def get_cookie_value(self, cookie=None, cookie_name=None):
         return None
 
     def append_cookie(
-        self,
-        cookie,
-        name,
-        payload,
-        typ,
-        domain=None,
-        path=None,
-        timestamp="",
-        max_age=0,
+            self,
+            cookie,
+            name,
+            payload,
+            typ,
+            domain=None,
+            path=None,
+            timestamp="",
+            max_age=0,
     ):
         """
         Adds a cookie to a SimpleCookie instance

src/oidcendpoint/oidc/session.py

@@ -366,10 +366,10 @@ def parse_request(self, request, auth=None, **kwargs):
                 pass
             else:
                 if (
-                    _ith.jws_header["alg"]
-                    not in self.endpoint_context.provider_info[
-                        "id_token_signing_alg_values_supported"
-                    ]
+                        _ith.jws_header["alg"]
+                        not in self.endpoint_context.provider_info[
+                    "id_token_signing_alg_values_supported"
+                ]
                 ):
                     raise JWSException("Unsupported signing algorithm")
 
@@ -396,6 +396,8 @@ def do_verified_logout(self, sid, client_id, alla=False, **kwargs):
 
                 if res.status_code < 300:
                     logger.info("Logged out from {}".format(_cid))
+                elif res.status_code in [501, 504]:
+                    logger.info("Got a %s which is acceptable", res.status_code)
                 elif res.status_code >= 400:
                     logger.info("failed to logout from {}".format(_cid))