encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-10 19:56:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up TokenHasReadWriteScope slightly

Browse Source
This commit is contained in:
Tom Christie 2013-03-12 19:07:30 +00:00
parent e8db504a98
commit f513db714d
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/compat.py
View File

@ -445,19 +445,15 @@ except ImportError:
# OAuth 2 support is optional
try:
import provider.oauth2 as oauth2_provider
# # Hack to fix submodule import issues
# submodules = ['backends', 'forms', 'managers', 'models', 'urls', 'views']
# for s in submodules:
# mod = __import__('provider.oauth2.%s.*' % s)
# setattr(oauth2_provider, s, mod)
from provider.oauth2 import backends as oauth2_provider_backends
from provider.oauth2 import models as oauth2_provider_models
from provider.oauth2 import forms as oauth2_provider_forms
from provider import scope as oauth2_provider_scope
from provider import constants as oauth2_constants
except ImportError:
oauth2_provider = None
oauth2_provider_backends = None
oauth2_provider_models = None
oauth2_provider_forms = None
oauth2_provider_scope = None
oauth2_constants = None

31
rest_framework/permissions.py
View File

@ -7,7 +7,7 @@ import warnings
SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS']
from rest_framework.compat import oauth2_provider_scope
from rest_framework.compat import oauth2_provider_scope, oauth2_constants
class BasePermission(object):
@ -142,25 +142,18 @@ class TokenHasReadWriteScope(BasePermission):
"""
def has_permission(self, request, view):
if not request.auth:
return False
token = request.auth
read_only = request.method in SAFE_METHODS
if hasattr(request.auth, 'resource'): # oauth 1
if read_only:
return True
elif request.auth.resource.is_readonly is False:
return True
return False
elif hasattr(request.auth, 'scope'): # oauth 2
scope_valid = lambda scope_wanted_key, scope_had: oauth2_provider_scope.check(
oauth2_provider_scope.SCOPE_NAME_DICT[scope_wanted_key], scope_had)
if read_only and scope_valid('read', request.auth.scope):
return True
elif scope_valid('write', request.auth.scope):
return True
if not token:
return False
if hasattr(token, 'resource'): # OAuth 1
return read_only or not request.auth.resource.is_readonly
elif hasattr(token, 'scope'): # OAuth 2
required = oauth2_constants.READ if read_only else oauth2_constants.WRITE
return oauth2_provider_scope.check(required, request.auth.scope)
else:
# Improperly configured!
pass
assert False, ('TokenHasReadWriteScope requires either the'
'`OAuthAuthentication` or `OAuth2Authentication` authentication '
'class to be used.')