Merge pull request #45 from ridi/feature/logic-for-error

유저 생성 실패하면 401 에러 리턴

.flake8

@@ -2,11 +2,12 @@
 
 # F401  imported but unused
 
-ignore=F401
+ignore=F401, E722
 
 max-line-length=140
 
 exclude =
     ./docs
     ./venv
+    ./tests
     migrations

.pylintrc

@@ -66,7 +66,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 
-disable=C0111, E0611, C0326, R0903, E0402, W0611, C0103, R0201, W0613, W0614, C0411
+disable=C0111, E0611, C0326, R0903, E0402, W0611, C0103, R0201, W0613, W0614, C0411, W0212, W0702, R1705
 # C0111 missing-docstring Missing docstring
 # E0611 no-name-in-module Missing __init__.py
 # C0326 bad-whitespace Check on flake8. pylint dose not support check use spaces around the = sign when used to indicate a keyword argument or a default parameter value.
@@ -76,9 +76,11 @@ disable=C0111, E0611, C0326, R0903, E0402, W0611, C0103, R0201, W0613, W0614, C0
 # C0103 invalid-name
 # R0201 no-self-use
 # W0613 unused-argument
-# C0411 wrong-import-order
 # W0614 unused-wildcard-import
-
+# C0411 wrong-import-order
+# W0212 protected-access
+# W0702 bare-except
+# R1705 no-else-return
 
 [REPORTS]
 

.travis.yml

@@ -12,8 +12,9 @@ jobs:
   include:
   - stage: test
     before_script: make install-dev
-    script: make lint
-    script: make test
+    script:
+      - make lint
+      - make test
 
   - stage: deploy
     script: skip

CHANGES.md

@@ -1,8 +1,9 @@
 Changelog
 =========
-1.0.6 (Mar 30th 2020)
+1.0.6 (Apr 27th 2020)
 ------------------
-- support 'EC' key_type on JWKS
+- Support 'EC' key_type on JWKS
+- Add logic to failed in get user object from token_info
 
 1.0.5 (Dec 2nd 2019)
 ------------------

ridi_django_oauth2/decorators.py

@@ -8,7 +8,7 @@
 RESPONSE_HANDLER_TYPE = typing.Optional[typing.Callable]
 
 
-def login_required(response_handler: RESPONSE_HANDLER_TYPE=None):
+def login_required(response_handler: RESPONSE_HANDLER_TYPE = None):
     def decorator(func):
         def wrapper(self, request, *args, **kwargs):
             user = request.user
@@ -25,7 +25,7 @@ def wrapper(self, request, *args, **kwargs):
     return decorator
 
 
-def scope_required(required_scopes: typing.List, response_handler: RESPONSE_HANDLER_TYPE=None):
+def scope_required(required_scopes: typing.List, response_handler: RESPONSE_HANDLER_TYPE = None):
     def decorator(func):
         def wrapper(self, request, *args, **kwargs):
             token_info = request.user.token_info

ridi_django_oauth2/middlewares.py

@@ -23,14 +23,16 @@ def process_request(self, request):
                 return HttpUnauthorizedResponse()
 
         if token_info is not None:
-            self._set_user_in_request(request, token_info, token)
+            try:
+                self._set_user_in_request(request, token_info, token)
+            except:
+                return HttpUnauthorizedResponse()
 
         return None
 
     @staticmethod
     def _set_user_in_request(request, token_info: AccessTokenInfo, token: TokenData):
         get_user_from_token_info = RidiOAuth2Config.get_user_from_token_info_callable()
-
         if get_user_from_token_info:
             user = get_user_from_token_info(token_info)
 

ridi_oauth2/client/grant.py

@@ -57,7 +57,7 @@ def _request_token(self, data: typing.Dict) -> TokenData:
         )
 
     @classmethod
-    def _request(cls, method: str, url: str, data: typing.Dict, headers: typing.Dict=None) -> TokenData:
+    def _request(cls, method: str, url: str, data: typing.Dict, headers: typing.Dict = None) -> TokenData:
         try:
             response = requests.request(method=method, url=url, data=data, headers=headers)
             response.raise_for_status()

ridi_oauth2/introspector/base.py

@@ -2,7 +2,7 @@
 
 
 class BaseIntrospector:
-    def __init__(self, access_token: str, token_type_hint: str=None):
+    def __init__(self, access_token: str, token_type_hint: str = None):
         self._access_token = access_token
         self._token_type_hint = token_type_hint
 

ridi_oauth2/introspector/exceptions.py

@@ -28,11 +28,3 @@ class NotExistedKey(PublicKeyException):
 
 class PublicRequestException(PublicKeyException):
     pass
-
-
-class AccountServerException(PublicRequestException):
-    pass
-
-
-class ClientRequestException(PublicRequestException):
-    pass

ridi_oauth2/introspector/key_handler.py

@@ -1,13 +1,13 @@
 from typing import Dict, List
 
 import requests
-from requests import RequestException, Response
+from requests import Response, HTTPError
 
 from ridi_django_oauth2.config import RidiOAuth2Config
 from ridi_django_oauth2_lib.decorators.retry import RetryFailException, retry
 from ridi_oauth2.introspector.constants import JWKKeyType, JWKUse
 from ridi_oauth2.introspector.dtos import BaseJWKDto
-from ridi_oauth2.introspector.exceptions import AccountServerException, ClientRequestException, FailToLoadPublicKeyException, \
+from ridi_oauth2.introspector.exceptions import FailToLoadPublicKeyException, \
     InvalidPublicKey, NotExistedKey
 from ridi_oauth2.introspector.factories import JWKDtoFactory
 
@@ -58,14 +58,11 @@ def _memorize_key_dtos(cls, client_id: str, keys: List[BaseJWKDto]):
 
     @staticmethod
     def _process_response(response: Response) -> Dict:
-        if response.status_code >= 500:
-            raise AccountServerException
-        elif response.status_code >= 400:
-            raise ClientRequestException
+        response.raise_for_status()
         return response.json()
 
     @classmethod
-    @retry(retry_count=3, retriable_exceptions=(RequestException, AccountServerException,))
+    @retry(retry_count=3, retriable_exceptions=(HTTPError, ))
     def _get_valid_public_keys_by_client_id(cls, client_id: str) -> List[BaseJWKDto]:
         response = requests.request(
             method='GET',

setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = '1.0.5'
+version = '1.0.6'
 
 # When the project is installed by pip, this is the specification that is used to install its dependencies.
 install_requires = [

tests/tests_ridi_django_oauth2/test_token_util.py

@@ -17,8 +17,8 @@
 
 def generate_ec_private_key():
     return ec.generate_private_key(
-            curve=ec.SECP256R1,
-            backend=default_backend()
+        curve=ec.SECP256R1,
+        backend=default_backend()
     )