Ran isort and blacken.

Author: rohe

.travis.yml

@@ -10,7 +10,7 @@ python:
 addons:
   apt:
     packages:
-      - 
+      -
 
 install:
   - pip install codecov

src/oidcendpoint/__init__.py

@@ -38,4 +38,4 @@ def rndstr(size=16):
     :return: string
     """
     chars = string.ascii_letters + string.digits
-    return ''.join(rnd.choice(chars) for i in range(size))
+    return "".join(rnd.choice(chars) for i in range(size))

src/oidcendpoint/client_authn.py

@@ -137,7 +137,7 @@ def verify(self, request, **kwargs):
             raise AuthnFailure("Could not verify client_assertion.")
 
         authtoken = sanitize(ca_jwt)
-        if hasattr(ca_jwt, 'to_dict') and callable(ca_jwt, 'to_dict'):
+        if hasattr(ca_jwt, "to_dict") and callable(ca_jwt, "to_dict"):
             authtoken = sanitize(ca_jwt.to_dict())
         logger.debug("authntoken: {}".format(authtoken))
 
@@ -258,15 +258,18 @@ def verify_client(
 
         # store what authn method was used
         if auth_info.get("method"):
-            if endpoint_context.cdb[client_id].get("auth_method") and \
-               request.__class__.__name__ in endpoint_context.cdb[client_id]["auth_method"]:
+            if (
+                endpoint_context.cdb[client_id].get("auth_method")
+                and request.__class__.__name__
+                in endpoint_context.cdb[client_id]["auth_method"]
+            ):
                 endpoint_context.cdb[client_id]["auth_method"][
                     request.__class__.__name__
                 ] = auth_info["method"]
             else:
                 endpoint_context.cdb[client_id]["auth_method"] = {
                     request.__class__.__name__: auth_info["method"]
-                    }
+                }
 
     elif not client_id and get_client_id_from_token:
         if not _token:
@@ -275,8 +278,9 @@ def verify_client(
 
         try:
             # get_client_id_from_token is a callback... Do not abuse for code readability.
-            auth_info["client_id"] = get_client_id_from_token(endpoint_context,
-                                                              _token, request)
+            auth_info["client_id"] = get_client_id_from_token(
+                endpoint_context, _token, request
+            )
         except KeyError:
             raise ValueError("Unknown token")
 

src/oidcendpoint/common/authorization.py

@@ -39,9 +39,7 @@ def inputs(form_args):
     element = []
     html_field = '<input type="hidden" name="{}" value="{}"/>'
     for name, value in form_args.items():
-        element.append(
-            html_field.format(name, value)
-        )
+        element.append(html_field.format(name, value))
     return "\n".join(element)
 
 
@@ -263,7 +261,9 @@ def __call__(self, client_id, endpoint_context, alg, alg_type):
             _allowed = _pinfo.get(_sup)
 
         if alg not in _allowed:
-            logger.error("Signing alg user: {} not among allowed: {}".format(alg, _allowed))
+            logger.error(
+                "Signing alg user: {} not among allowed: {}".format(alg, _allowed)
+            )
             raise ValueError("Not allowed '%s' algorithm used", alg)
 
 

src/oidcendpoint/cookie.py

@@ -106,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:
@@ -125,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:
@@ -136,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
@@ -197,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,
@@ -286,13 +286,13 @@ class CookieDealer(object):
     """
 
     def __init__(
-            self,
-            sign_key="",
-            enc_key="",
-            sign_alg="SHA256",
-            default_values=None,
-            sign_jwk=None,
-            enc_jwk=None
+        self,
+        sign_key="",
+        enc_key="",
+        sign_alg="SHA256",
+        default_values=None,
+        sign_jwk=None,
+        enc_jwk=None,
     ):
 
         if sign_key:
@@ -418,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/endpoint.py

@@ -112,7 +112,10 @@ def construct_provider_info(default_capabilities, **kwargs):
 
                 if _permitted and not _permitted.issuperset(set(_proposal)):
                     raise ValueError(
-                        "Proposed set of values outside set of permitted ({})".__format__(attr))
+                        "Proposed set of values outside set of permitted ({})".__format__(
+                            attr
+                        )
+                    )
 
                 provider_info[attr] = _proposal
         return provider_info
@@ -142,8 +145,14 @@ def __init__(self, endpoint_context, **kwargs):
         self.kwargs = kwargs
         self.full_path = ""
 
-        for param in ["request_cls", "response_cls", "request_format", "request_placement",
-                      "response_format", "response_placement"]:
+        for param in [
+            "request_cls",
+            "response_cls",
+            "request_format",
+            "request_placement",
+            "response_format",
+            "response_placement",
+        ]:
             _val = kwargs.get(param)
             if _val:
                 setattr(self, param, _val)
@@ -152,9 +161,13 @@ def __init__(self, endpoint_context, **kwargs):
             self.client_authn_method = kwargs["client_authn_method"]
         elif self.default_capabilities is not None:
             if "client_authn_method" in self.default_capabilities:
-                self.client_authn_method = self.default_capabilities["client_authn_method"]
+                self.client_authn_method = self.default_capabilities[
+                    "client_authn_method"
+                ]
 
-        self.provider_info = construct_provider_info(self.default_capabilities, **kwargs)
+        self.provider_info = construct_provider_info(
+            self.default_capabilities, **kwargs
+        )
 
     def parse_request(self, request, auth=None, **kwargs):
         """

src/oidcendpoint/endpoint_context.py

@@ -84,17 +84,17 @@ def get_token_handlers(conf):
 
 class EndpointContext:
     def __init__(
-            self,
-            conf,
-            keyjar=None,
-            client_db=None,
-            session_db=None,
-            sso_db=None,
-            cwd="",
-            cookie_dealer=None,
-            httpc=None,
-            cookie_name=None,
-            jwks_uri_path=None,
+        self,
+        conf,
+        keyjar=None,
+        client_db=None,
+        session_db=None,
+        sso_db=None,
+        cwd="",
+        cookie_dealer=None,
+        httpc=None,
+        cookie_name=None,
+        jwks_uri_path=None,
     ):
         self.conf = conf
         self.keyjar = keyjar or KeyJar()
@@ -173,8 +173,9 @@ def __init__(
                 loader = conf["template_loader"]
             except KeyError:
                 template_dir = conf["template_dir"]
-                loader = Environment(loader=FileSystemLoader(template_dir),
-                                     autoescape=True)
+                loader = Environment(
+                    loader=FileSystemLoader(template_dir), autoescape=True
+                )
             self.template_handler = Jinja2TemplateHandler(loader)
 
         self.setup = {}
@@ -196,15 +197,20 @@ def __init__(
             args = {k: v for k, v in conf["jwks"].items() if k != "uri_path"}
             self.keyjar = init_key_jar(**args)
 
-        for item in ['cookie_dealer', "authz", "authentication", "id_token", "scope2claims"]:
+        for item in [
+            "cookie_dealer",
+            "authz",
+            "authentication",
+            "id_token",
+            "scope2claims",
+        ]:
             _func = getattr(self, "do_{}".format(item), None)
             if _func:
                 _func()
 
         _cap = self.do_endpoints()
 
-        for item in ["userinfo", "login_hint_lookup", "login_hint2acrs",
-                     "add_on"]:
+        for item in ["userinfo", "login_hint_lookup", "login_hint2acrs", "add_on"]:
             _func = getattr(self, "do_{}".format(item), None)
             if _func:
                 _func()
@@ -225,7 +231,7 @@ def set_session_db(self, sso_db=None, db=None):
         self.do_session_db(sso_db, db)
         # append useinfo db to the session db
         self.do_userinfo()
-        logger.debug('Session DB: {}'.format(self.sdb.__dict__))
+        logger.debug("Session DB: {}".format(self.sdb.__dict__))
 
     def do_add_on(self):
         if self.conf.get("add_on"):
@@ -258,8 +264,9 @@ def do_userinfo(self):
                 self.userinfo = init_user_info(_conf, self.cwd)
                 self.sdb.userinfo = self.userinfo
             else:
-                logger.warning(('Cannot init_user_info if any '
-                                'session_db was provided.'))
+                logger.warning(
+                    ("Cannot init_user_info if any " "session_db was provided.")
+                )
 
     def do_id_token(self):
         _conf = self.conf.get("id_token")
@@ -271,7 +278,9 @@ def do_id_token(self):
     def do_authentication(self):
         _conf = self.conf.get("authentication")
         if _conf:
-            self.authn_broker = populate_authn_broker(_conf, self, self.template_handler)
+            self.authn_broker = populate_authn_broker(
+                _conf, self, self.template_handler
+            )
         else:
             self.authn_broker = {}
 
@@ -283,7 +292,7 @@ def do_authentication(self):
                 pass
 
     def do_cookie_dealer(self):
-        _conf = self.conf.get('cookie_dealer')
+        _conf = self.conf.get("cookie_dealer")
         if _conf:
             if not self.cookie_dealer:
                 self.cookie_dealer = init_service(_conf)
@@ -301,9 +310,7 @@ def do_sub_func(self):
 
     def do_session_db(self, sso_db, db=None):
         self.sdb = create_session_db(
-            self, self.th_args, db=db,
-            sso_db=sso_db,
-            sub_func=self._sub_func
+            self, self.th_args, db=db, sso_db=sso_db, sub_func=self._sub_func
         )
 
     def do_endpoints(self):
@@ -363,6 +370,6 @@ def create_providerinfo(self, capabilities):
             _provider_info["jwks_uri"] = self.jwks_uri
 
         _provider_info.update(self.idtoken.provider_info)
-        _provider_info['claims_supported'] = self.claims_supported()
+        _provider_info["claims_supported"] = self.claims_supported()
 
         return _provider_info

src/oidcendpoint/exception.py

@@ -81,4 +81,3 @@ class InvalidRequest(OidcEndpointError):
 
 class CapabilitiesMisMatch(OidcEndpointError):
     pass
-