Merge pull request #203 from psavoie/develop

Add pep8 compliance and checker

oidc_provider/lib/utils/common.py

@@ -11,11 +11,6 @@ from django.http import HttpResponse
 
 from oidc_provider import settings
 
-try:
-    from urlparse import urlsplit, urlunsplit
-except ImportError:
-    from urllib.parse import urlsplit, urlunsplit
-
 
 def redirect(uri):
     """
@@ -81,7 +76,8 @@ def default_after_userlogin_hook(request, user, client):
     return None
 
 
-def default_after_end_session_hook(request, id_token=None, post_logout_redirect_uri=None, state=None, client=None, next_page=None):
+def default_after_end_session_hook(
+        request, id_token=None, post_logout_redirect_uri=None, state=None, client=None, next_page=None):
     """
     Default function for setting OIDC_AFTER_END_SESSION_HOOK.
 
@@ -97,7 +93,8 @@ def default_after_end_session_hook(request, id_token=None, post_logout_redirect_
     :param state: state param from url query params
     :type state: str
 
-    :param client: If id_token has `aud` param and associated Client exists, this is an instance of it - do NOT trust this param
+    :param client: If id_token has `aud` param and associated Client exists,
+        this is an instance of it - do NOT trust this param
     :type client: oidc_provider.models.Client
 
     :param next_page: calculated next_page redirection target

oidc_provider/lib/utils/oauth2.py

@@ -28,12 +28,15 @@ def extract_access_token(request):
     return access_token
 
 
-def protected_resource_view(scopes=[]):
+def protected_resource_view(scopes=None):
     """
     View decorator. The client accesses protected resources by presenting the
     access token to the resource server.
     https://tools.ietf.org/html/rfc6749#section-7
     """
+    if scopes is None:
+        scopes = []
+
     def wrapper(view):
         def view_wrapper(request,  *args, **kwargs):
             access_token = extract_access_token(request)
@@ -52,9 +55,10 @@ def protected_resource_view(scopes=[]):
                 if not set(scopes).issubset(set(kwargs['token'].scope)):
                     logger.debug('[UserInfo] Missing openid scope.')
                     raise BearerTokenError('insufficient_scope')
-            except (BearerTokenError) as error:
+            except BearerTokenError as error:
                 response = HttpResponse(status=error.status)
-                response['WWW-Authenticate'] = 'error="{0}", error_description="{1}"'.format(error.code, error.description)
+                response['WWW-Authenticate'] = 'error="{0}", error_description="{1}"'.format(
+                    error.code, error.description)
                 return response
 
             return view(request,  *args, **kwargs)

oidc_provider/lib/utils/token.py

@@ -18,12 +18,14 @@ from oidc_provider.models import (
 from oidc_provider import settings
 
 
-def create_id_token(user, aud, nonce='', at_hash='', request=None, scope=[]):
+def create_id_token(user, aud, nonce='', at_hash='', request=None, scope=None):
     """
     Creates the id_token dictionary.
     See: http://openid.net/specs/openid-connect-core-1_0.html#IDToken
     Return a dic.
     """
+    if scope is None:
+        scope = []
     sub = settings.get('OIDC_IDTOKEN_SUB_GENERATOR', import_str=True)(user=user)
 
     expires_in = settings.get('OIDC_IDTOKEN_EXPIRE')
@@ -63,6 +65,7 @@ def create_id_token(user, aud, nonce='', at_hash='', request=None, scope=[]):
 
     return dic
 
+
 def encode_id_token(payload, client):
     """
     Represent the ID Token as a JSON Web Token (JWT).
@@ -72,6 +75,7 @@ def encode_id_token(payload, client):
     _jws = JWS(payload, alg=client.jwt_alg)
     return _jws.sign_compact(keys)
 
+
 def decode_id_token(token, client):
     """
     Represent the ID Token as a JSON Web Token (JWT).
@@ -80,6 +84,7 @@ def decode_id_token(token, client):
     keys = get_client_alg_keys(client)
     return JWS().verify_compact(token, keys=keys)
 
+
 def client_id_from_id_token(id_token):
     """
     Extracts the client id from a JSON Web Token (JWT).
@@ -88,6 +93,7 @@ def client_id_from_id_token(id_token):
     payload = JWT().unpack(id_token).payload()
     return payload.get('aud', None)
 
+
 def create_token(user, client, scope, id_token_dic=None):
     """
     Create and populate a Token object.
@@ -108,6 +114,7 @@ def create_token(user, client, scope, id_token_dic=None):
 
     return token
 
+
 def create_code(user, client, scope, nonce, is_authentication,
                 code_challenge=None, code_challenge_method=None):
     """
@@ -132,6 +139,7 @@ def create_code(user, client, scope, nonce, is_authentication,
 
     return code
 
+
 def get_client_alg_keys(client):
     """
     Takes a client and returns the set of keys associated with it.