Merge branch 'feature/transition_acls' into 'feature/transition_acls'

Feature/transition acls

See merge request !10

mayan/apps/acls/managers.py

@@ -48,6 +48,10 @@ class AccessControlListManager(models.Manager):
 
     def check_access(self, permissions, user, obj, related=None):
         if user.is_superuser or user.is_staff:
+            logger.debug('Permissions "%s" on "%s" granted to user "%s" as superuser or staff',
+                         permissions,
+                         obj,
+                         user)
             return True
 
         try:
@@ -77,15 +81,31 @@ class AccessControlListManager(models.Manager):
         for group in user.groups.all():
             for role in group.roles.all():
                 if set(stored_permissions).intersection(set(self.get_inherited_permissions(role=role, obj=obj))):
+                    logger.debug('Permissions "%s" on "%s" granted to user "%s" through role "%s" via inherited ACL',
+                                 permissions,
+                                 obj,
+                                 user,
+                                 role)
                     return True
 
                 user_roles.append(role)
 
         if not self.filter(content_type=ContentType.objects.get_for_model(obj), object_id=obj.pk, permissions__in=stored_permissions, role__in=user_roles).exists():
+            logger.debug('Permissions "%s" on "%s" denied for user "%s"',
+                         permissions,
+                         obj,
+                         user)
             raise PermissionDenied(ugettext('Insufficient access.'))
+        logger.debug('Permissions "%s" on "%s" granted to user "%s" through roles "%s" by direct ACL',
+                     permissions,
+                     obj,
+                     user,
+                     user_roles)
 
     def filter_by_access(self, permission, user, queryset):
         if user.is_superuser or user.is_staff:
+            logger.debug('Unfiltered queryset returned to user "%s" as superuser or staff',
+                         user)
             return queryset
 
         user_roles = []
@@ -124,5 +144,8 @@ class AccessControlListManager(models.Manager):
             content_type=content_type, role__in=user_roles,
             permissions=permission.stored_permission
         ).values_list('object_id', flat=True))
+        logger.debug('Filtered queryset returned to user "%s" based on roles "%s"',
+                     user,
+                     user_roles)
 
         return queryset.filter(parent_acl_query | acl_query)

mayan/apps/permissions/classes.py

@@ -61,8 +61,9 @@ class Permission(object):
             if permission.stored_permission.requester_has_this(requester):
                 return True
 
-        logger.debug('no permission')
+        logger.debug('User "%s" does not have permissions "%s"',
-
+                     requester,
+                     permissions)
         raise PermissionDenied(_('Insufficient permissions.'))
 
     @classmethod

mayan/apps/permissions/models.py

@@ -46,17 +46,25 @@ class StoredPermission(models.Model):
         verbose_name_plural = _('Permissions')
 
     def requester_has_this(self, user):
-        logger.debug('user: %s', user)
         if user.is_superuser or user.is_staff:
+            logger.debug('Permission "%s" granted to user "%s" as superuser or staff',
+                         self,
+                         user)
             return True
 
         # Request is one of the permission's holders?
         for group in user.groups.all():
             for role in group.roles.all():
                 if self in role.permissions.all():
+                    logger.debug('Permission "%s" granted to user "%s" through role "%s"',
+                                 self,
+                                 user,
+                                 role)
                     return True
 
-        logger.debug('Fallthru')
+        logger.debug('Fallthru: Permission "%s" not granted to user "%s"',
+                     self,
+                     user)
         return False