Changeset 4025

Timestamp:

11/06/06 15:25:29 (2 years ago)

Author:

jkocherhans

Message:

Applied patch from http://code.djangoproject.org/wiki/GenericAuthorization things are working now, but ugly.

Files:

• django/branches/generic-auth/django/contrib/admin/templatetags/adminapplist.py (modified) (2 diffs)
• django/branches/generic-auth/django/contrib/admin/views/main.py (modified) (11 diffs)
• django/branches/generic-auth/django/contrib/auth/__init__.py (modified) (1 diff)
• django/branches/generic-auth/django/db/models/options.py (modified) (1 diff)
• django/branches/generic-auth/tests/regressiontests/authorization (deleted)

django/branches/generic-auth/django/contrib/admin/templatetags/adminapplist.py

@@ -1 +1 @@
-from django import template
-from django.db.models import get_models
+from django.contrib.auth import has_permission
+from django.contrib.auth.models import Permission
-
-register = template.Library()
@@ -27 +29 @@
-                for m in app_models:
-                    if m._meta.admin:
+                        opts = m._meta
-                        perms = {
-user.has_perm("%s.%s" % (app_label, m._meta.get_add_permission()
-user.has_perm("%s.%s" % (app_label, m._meta.get_change_permission()
-user.has_perm("%s.%s" % (app_label, m._meta.get_delete_permission()
+has_permission(user, opts.get_add_permission(
+has_permission(user, opts.get_change_permission(
+has_permission(user, opts.get_delete_permission(
-                        }
-

django/branches/generic-auth/django/contrib/admin/views/main.py

@@ -1 +1 @@
-from django import forms, template
-from django.conf import settings
+from django.contrib.auth import has_permission
-from django.contrib.admin.filterspecs import FilterSpec
-from django.contrib.admin.views.decorators import staff_member_required
@@ -200 +201 @@
-        'add': add,
-        'change': change,
-
-
+.codename
+.codename
-        'has_file_field': opts.has_field_type(models.FileField),
-        'has_absolute_url': hasattr(model, 'get_absolute_url'),
@@ -230 +231 @@
-    opts = model._meta
-
-request.user.has_perm(app_label + '.' +
+has_permission(request.user,
-        raise PermissionDenied
-
-    if post_url is None:
-        if request.user.has_perm(app_label + '.' + opts.get_change_permission()):
-            # redirect to list view
-            post_url = '../'
-        else:
-            # Object list will give 'Permission Denied', so go back to admin home
-            post_url = '../../../'
-
-    manipulator = model.AddManipulator()
@@ -256 +249 @@
-            LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, str(new_object), ADDITION)
-            msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object}
+
+            if post_url is None:
+                # We want to call has permission WITHOUT passing it the new
+                # object here. We're concerned with whether the user can edit
+                # ANY instances of this model, not just the one we created.
+                if has_permission(request.user, opts.get_change_permission()):
+                    # redirect to list view
+                    post_url = '../'
+                else:
+                    # Object list will give 'Permission Denied', so go back to admin home
+                    post_url = '../../../'
+
-            # Here, we distinguish between different save types by checking for
-            # the presence of keys in request.POST.
@@ -304 +309 @@
-    opts = model._meta
-
-    if not request.user.has_perm(app_label + '.' + opts.get_change_permission()):
-        raise PermissionDenied
-
-    if request.POST and request.POST.has_key("_saveasnew"):
-        return add_stage(request, app_label, model_name, form_url='../../add/')
@@ -314 +316 @@
-    except ObjectDoesNotExist:
-        raise Http404
+
+    if not has_permission(request.user, opts.get_change_permission(), manipulator.original_object):
+        raise PermissionDenied
-
-    if request.POST:
@@ -420 +425 @@
-            else:
-                if related.opts.admin:
-
-
+
-                        perms_needed.add(related.opts.verbose_name)
-                        # We don't care about populating deleted_objects now.
@@ -451 +455 @@
-            # permission to delete them, add the missing perm to perms_needed.
-            if related.opts.admin and has_related_objs:
-
-
+
-                    perms_needed.add(rel_opts_name)
-    for related in opts.get_all_related_many_to_many_objects():
@@ -480 +483 @@
-        # permission to change them, add the missing perm to perms_needed.
-        if related.opts.admin and has_related_objs:
-
-
+
-                perms_needed.add(related.opts.verbose_name)
-
@@ -491 +493 @@
-        raise Http404, "App %r, model %r, not found" % (app_label, model_name)
-    opts = model._meta
-
+
+
-        raise PermissionDenied
-    obj = get_object_or_404(model, pk=object_id)
-
-    # Populate deleted_objects, a data structure of all related objects that
@@ -731 +733 @@
-    if model is None:
-        raise Http404, "App %r, model %r, not found" % (app_label, model_name)
-
+
+
+
+
-        raise PermissionDenied
-    try:

django/branches/generic-auth/django/contrib/auth/__init__.py

@@ -5 +5 @@
-LOGIN_URL = '/accounts/login/'
-REDIRECT_FIELD_NAME = 'next'
+
+def default_has_permission(user, permission, obj):
+    p_name = "%s.%s" % (permission.content_type.app_label, permission.codename)
+    return user.has_perm(p_name)
+
+class HasPermission(object):
+    """
+    Function that supports multiple implementations via a type registry. The 
+    implemetation called depends on the argument types.
+    """
+    def __init__(self):
+        self.registry = {}
+
+    def __call__(self, user, permission, obj=None):
+        # TODO: this isn't very robust. Only matches on exact types. Support 
+        # for matching subclasses and caching registry hits would be helpful,
+        # but we'll add that later
+        types = (type(user), type(permission), type(obj))
+        func = self.registry.get(types)
+        if func is not None:
+            return func(user, permission, obj)
+        else:
+            return default_has_permission(user, permission, obj)
+
+    def register(self, func, user_type, permission_type, obj_type=type(None)):
+        types = (user_type, permission_type, obj_type)
+        self.registry[types] = func
+
+has_permission = HasPermission()
-
-def load_backend(path):

django/branches/generic-auth/django/db/models/options.py

@@ -107 +107 @@
-
-    def get_add_permission(self):
-
+
+
+
+
+
-
-    def get_change_permission(self):
-
+
+
+
+
+
-
-    def get_delete_permission(self):
-
+
+
+
+
+
-
-    def get_all_related_objects(self):