Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-04-20 06:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed dependency on external decorator package, using functools.wraps instead.

Browse source
This commit is contained in:
Jannis Leidel 2009-07-06 11:08:36 +02:00
parent 3fe2ba2991
commit aad51ef877
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
setup.py
View file

@ -25,7 +25,4 @@ setup(
]
},
zip_safe=False,
install_requires=(
'decorator>=3.0.1'
),
)

63
src/authority/decorators.py
View file

@ -1,8 +1,8 @@
import inspect
from decorator import decorator
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseForbidden, HttpResponseRedirect, Http404
from django.utils.http import urlquote
from django.utils.functional import wraps
from django.db.models import Model, get_model
from django.shortcuts import get_object_or_404
from django.conf import settings
@ -21,35 +21,38 @@ def permission_required(perm, *args, **kwargs):
redirect_field_name = kwargs.pop('redirect_field_name', REDIRECT_FIELD_NAME)
redirect_to_login = kwargs.pop('redirect_to_login', True)
model_lookups = args
def _permission_required(view_func, request, *args, **kwargs):
objs = []
if request.user.is_authenticated():
for model_lookup, query in zip(model_lookups, args):
if query is None:
continue
model, lookup = model_lookup
if isinstance(model, basestring):
model_class = get_model(*model.split("."))
else:
model_class = model
if model_class is None:
raise ValueError(
"The given argument '%s' is not a valid model." % model)
if inspect.isclass(model_class) and \
not issubclass(model_class, Model):
raise ValueError(
'The argument %s needs to be a model.' % model)
objs.append(get_object_or_404(model_class, **{lookup: query}))
check = permissions.registry.get_check(request.user, perm)
if check is not None:
if check(*objs):
return view_func(request, *args, **kwargs)
if redirect_to_login:
path = urlquote(request.get_full_path())
tup = login_url, redirect_field_name, path
return HttpResponseRedirect('%s?%s=%s' % tup)
return permission_denied(request)
return decorator(_permission_required)
def decorate(view_func):
def decorated(request, *args, **kwargs):
objs = []
if request.user.is_authenticated():
values = list(args) + kwargs.values()
for model_lookup, query in zip(model_lookups, values):
if query is None:
continue
model, lookup = model_lookup
if isinstance(model, basestring):
model_class = get_model(*model.split("."))
else:
model_class = model
if model_class is None:
raise ValueError(
"The given argument '%s' is not a valid model." % model)
if inspect.isclass(model_class) and \
not issubclass(model_class, Model):
raise ValueError(
'The argument %s needs to be a model.' % model)
objs.append(get_object_or_404(model_class, **{lookup: query}))
check = permissions.registry.get_check(request.user, perm)
if check is not None:
if check(*objs):
return view_func(request, *args, **kwargs)
if redirect_to_login:
path = urlquote(request.get_full_path())
tup = login_url, redirect_field_name, path
return HttpResponseRedirect('%s?%s=%s' % tup)
return permission_denied(request)
return wraps(view_func)(decorated)
return decorate
def permission_required_or_403(perm, *args, **kwargs):
"""