More pylinting.

Author: rohe

src/oidcservice/oidc/access_token.py

@@ -10,7 +10,7 @@
 
 __author__ = 'Roland Hedberg'
 
-logger = logging.getLogger(__name__)
+LOGGER = logging.getLogger(__name__)
 
 
 class AccessToken(access_token.AccessToken):

src/oidcservice/oidc/authorization.py

@@ -15,7 +15,7 @@
 
 __author__ = 'Roland Hedberg'
 
-logger = logging.getLogger(__name__)
+LOGGER = logging.getLogger(__name__)
 
 
 class Authorization(authorization.Authorization):
@@ -105,7 +105,77 @@ def oidc_pre_construct(self, request_args=None, **kwargs):
 
         return request_args, post_args
 
+    def get_request_object_signing_alg(self, **kwargs):
+        alg = ''
+        for arg in ["request_object_signing_alg", "algorithm"]:
+            try:  # Trumps everything
+                alg = kwargs[arg]
+            except KeyError:
+                pass
+            else:
+                break
+
+        if not alg:
+            try:
+                alg = self.service_context.behaviour[
+                    "request_object_signing_alg"]
+            except KeyError:  # Use default
+                alg = "RS256"
+        return alg
+
+    def store_request_on_file(self, req, **kwargs):
+        """
+        Stores the request parameter in a file.
+        :param req: The request
+        :param kwargs: Extra keyword arguments
+        :return: The URL the OP should use to access the file
+        """
+        try:
+            _webname = self.service_context.registration_response['request_uris'][0]
+            filename = self.service_context.filename_from_webname(_webname)
+        except KeyError:
+            filename, _webname = construct_request_uri(**kwargs)
+
+        fid = open(filename, mode="w")
+        fid.write(req)
+        fid.close()
+        return _webname
+
+    def construct_request_parameter(self, req, request_method, **kwargs):
+        """Construct a request parameter"""
+        alg = self.get_request_object_signing_alg(**kwargs)
+        kwargs["request_object_signing_alg"] = alg
+
+        if "keys" not in kwargs and alg and alg != "none":
+            kwargs["keys"] = self.service_context.keyjar
+
+        _srv_cntx = self.service_context
+        kwargs['issuer'] = _srv_cntx.client_id
+        try:
+            kwargs['recv'] = _srv_cntx.provider_info['issuer']
+        except KeyError:
+            kwargs['recv'] = _srv_cntx.issuer
+        del kwargs['service']
+
+        _req = make_openid_request(req, **kwargs)
+
+        # Should the request be encrypted
+        _req = request_object_encryption(_req, self.service_context,
+                                         **kwargs)
+
+        if request_method == "request":
+            req["request"] = _req
+        else:  # MUST be request_uri
+            req["request_uri"] = self.store_request_on_file(_req, **kwargs)
+
     def oidc_post_construct(self, req, **kwargs):
+        """
+        Modify the request arguments.
+
+        :param req: The request
+        :param kwargs: Extra keyword arguments
+        :return: A possibly modified request.
+        """
         if 'openid' in req['scope']:
             _response_type = req['response_type'][0]
             if 'id_token' in _response_type or 'code' in _response_type:
@@ -122,61 +192,7 @@ def oidc_post_construct(self, req, **kwargs):
         else:
             del kwargs['request_param']
 
-            alg = ''
-            for arg in ["request_object_signing_alg", "algorithm"]:
-                try:  # Trumps everything
-                    alg = kwargs[arg]
-                except KeyError:
-                    pass
-                else:
-                    break
-
-            if not alg:
-                try:
-                    alg = self.service_context.behaviour[
-                        "request_object_signing_alg"]
-                except KeyError:  # Use default
-                    alg = "RS256"
-
-            kwargs["request_object_signing_alg"] = alg
-
-            if "keys" not in kwargs and alg and alg != "none":
-                # _kty = alg2keytype(alg)
-                # try:
-                #     _kid = kwargs["sig_kid"]
-                # except KeyError:
-                #     _kid = self.service_context.kid["sig"].get(_kty, None)
-
-                kwargs["keys"] = self.service_context.keyjar
-
-            _srv_cntx = self.service_context
-            kwargs['issuer'] = _srv_cntx.client_id
-            try:
-                kwargs['recv'] = _srv_cntx.provider_info['issuer']
-            except KeyError:
-                kwargs['recv'] = _srv_cntx.issuer
-            del kwargs['service']
-
-            _req = make_openid_request(req, **kwargs)
-
-            # Should the request be encrypted
-            _req = request_object_encryption(_req, self.service_context,
-                                             **kwargs)
-
-            if _request_method == "request":
-                req["request"] = _req
-            else:  # MUST be request_uri
-                try:
-                    _webname = self.service_context.registration_response[
-                        'request_uris'][0]
-                    filename = self.service_context.filename_from_webname(
-                        _webname)
-                except KeyError:
-                    filename, _webname = construct_request_uri(**kwargs)
-                fid = open(filename, mode="w")
-                fid.write(_req)
-                fid.close()
-                req["request_uri"] = _webname
+            self.construct_request_parameter(req, _request_method, **kwargs)
 
         self.store_item(req, 'auth_request', req['state'])
         return req

src/oidcservice/oidc/provider_info_discovery.py

@@ -82,7 +82,7 @@ def __init__(self, service_context, state_db, client_authn_factory=None,
             client_authn_factory=client_authn_factory, conf=conf)
 
     def update_service_context(self, resp, **kwargs):
-        self._update_service_context(resp, **kwargs)
+        self._update_service_context(resp)
         self.match_preferences(resp, self.service_context.issuer)
         if 'pre_load_keys' in self.conf and self.conf['pre_load_keys']:
             _jwks = self.service_context.keyjar.export_jwks_as_json(

src/oidcservice/service.py

@@ -310,7 +310,7 @@ def get_request_parameters(self, request_args=None, method="",
             request_body_type = self.request_body_type
 
         request = self.construct_request(request_args=request_args, **kwargs)
-
+        LOGGER.debug("Request: %s", request.to_dict())
         _info = {'method': method}
 
         _args = kwargs.copy()