diff --git a/djangoldp/__init__.py b/djangoldp/__init__.py
index 7deb3ab1dd665f79a867616966d6046d03968cad..5c4fa333d4cb80499002f6da50e1731faca9ac7d 100644
--- a/djangoldp/__init__.py
+++ b/djangoldp/__init__.py
@@ -1,4 +1,4 @@
from django.db.models import options
__version__ = '0.0.0'
-options.DEFAULT_NAMES += ('lookup_field', 'rdf_type', 'rdf_context', 'auto_author', 'view_set', 'container_path', 'permission_classes', 'serializer_fields', 'nested_fields', 'depth', 'many_depth')
\ No newline at end of file
+options.DEFAULT_NAMES += ('lookup_field', 'rdf_type', 'rdf_context', 'auto_author', 'view_set', 'container_path', 'permission_classes', 'serializer_fields', 'nested_fields', 'depth', 'many_depth', 'anonymous_perms', 'authenticated_perms', 'owner_perms')
\ No newline at end of file
diff --git a/djangoldp/models.py b/djangoldp/models.py
index a3fe37c6d74021e40a343bbf66ae8748446d47b6..f091a037248b5beadd3e6b6c4d1359668597779e 100644
--- a/djangoldp/models.py
+++ b/djangoldp/models.py
@@ -5,6 +5,7 @@ from django.db.models.base import ModelBase
from django.urls import get_resolver
from django.utils.decorators import classonlymethod
from guardian.shortcuts import get_perms
+from djangoldp.permissions import LDPPermissions
User._meta.rdf_type = "foaf:user"
@@ -112,11 +113,8 @@ class Model(models.Model):
@staticmethod
def get_permissions(obj_or_model, user_or_group, filter):
permissions = filter
- for permission_class in Model.get_permission_classes(obj_or_model, []):
+ for permission_class in Model.get_permission_classes(obj_or_model, [LDPPermissions]):
permissions = permission_class().filter_user_perms(user_or_group, obj_or_model, permissions)
-
- if not isinstance(user_or_group, AnonymousUser):
- permissions += get_perms(user_or_group, obj_or_model)
return [{'mode': {'@type': name.split('_')[0]}} for name in permissions]
diff --git a/djangoldp/permissions.py b/djangoldp/permissions.py
index b323c9925ec223df18d9fef36bb94ac2d983089b..af3774c122f4ee0b92635c2cf18165e85a419e20 100644
--- a/djangoldp/permissions.py
+++ b/djangoldp/permissions.py
@@ -1,156 +1,103 @@
-from guardian.shortcuts import get_objects_for_user
-from rest_framework import filters
-from rest_framework import permissions
-
-from djangoldp.models import Model
-
-"""
-Liste des actions passées dans views selon le protocole REST :
- list
- create
- retrieve
- update, partial update
- destroy
-Pour chacune de ces actions, on va définir si on accepte la requête (True) ou non (False)
-"""
-"""
- The instance-level has_object_permission method will only be called if the view-level has_permission
- checks have already passed
-"""
-
-
-class WACPermissions(permissions.DjangoObjectPermissions):
- perms_map = {
- 'GET': ['%(app_label)s.view_%(model_name)s'],
- 'OPTIONS': [],
- 'HEAD': ['%(app_label)s.view_%(model_name)s'],
- 'POST': ['%(app_label)s.add_%(model_name)s'],
- 'PUT': ['%(app_label)s.change_%(model_name)s'],
- 'PATCH': ['%(app_label)s.change_%(model_name)s'],
- 'DELETE': ['%(app_label)s.delete_%(model_name)s'],
- }
+from rest_framework.permissions import DjangoObjectPermissions
+from django.core.exceptions import PermissionDenied
- def has_permission(self, request, view):
- if request.method == 'OPTIONS':
- return True
- else:
- return super().has_permission(request, view)
-
- # This method should be overriden by other permission classes
- def user_permissions(self, user, obj):
- return []
-
- def filter_user_perms(self, user_or_group, obj, permissions):
- return [perm for perm in permissions if perm in self.user_permissions(user_or_group, obj)]
+class LDPPermissions(DjangoObjectPermissions):
+ """
+ Default permissions
+ Anon: None
+ Auth: None but herit from Anon
+ Ownr: None but herit from Auth
+ """
+ anonymous_perms = []
+ authenticated_perms = ['inherit']
+ owner_perms = ['inherit']
-class ObjectFilter(filters.BaseFilterBackend):
- def filter_queryset(self, request, queryset, view):
+ def user_permissions(self, user, obj):
"""
- Ensure that queryset only contains objects visible by current user
+ Filter user permissions for a given object
"""
- perm = "view_{}".format(queryset.model._meta.model_name.lower())
- objects = get_objects_for_user(request.user, perm, klass=queryset)
- return objects
+ # Get Anonymous permissions from Model's Meta. If not found use default
+ anonymous_perms = getattr(obj._meta, 'anonymous_perms', self.anonymous_perms)
+ # Get Auth permissions from Model's Meta. If not found use default
+ authenticated_perms = getattr(obj._meta, 'authenticated_perms', self.authenticated_perms)
+ # Extend Auth if inherit is given
+ if 'inherit' in authenticated_perms:
+ authenticated_perms = authenticated_perms + list(set(anonymous_perms) - set(authenticated_perms))
-class ObjectPermission(WACPermissions):
- filter_class = ObjectFilter
+ # Get Owner permissions from Model's Meta. If not found use default
+ owner_perms = getattr(obj._meta, 'owner_perms', self.owner_perms)
+ # Extend Owner if inherit is given
+ if 'inherit' in owner_perms:
+ owner_perms = owner_perms + list(set(authenticated_perms) - set(owner_perms))
-
-class InboxPermissions(WACPermissions):
- """
- Everybody can create
- Author can edit
- """
- anonymous_perms = ['create']
- authenticated_perms = ['create']
- author_perms = ['view', 'update', 'partial_update']
-
- def has_permission(self, request, view):
- if view.action in ['create']:
- return True
- else:
- return super().has_permission(request, view)
-
- def has_object_permission(self, request, view, obj):
- if view.action in ['update', 'partial_update', 'destroy']:
- return False
- else:
- return super().has_object_permission(request, view, obj)
-
- def user_permissions(self, user, obj):
if user.is_anonymous():
- return self.anonymous_perms
+ return anonymous_perms
+
else:
if hasattr(obj._meta, 'auto_author') and getattr(obj, Model.get_meta(obj, 'auto_author')) == user:
- return self.author_perms
+ return owner_perms
+
else:
- return self.authenticated_perms
+ return authenticated_perms
+ def filter_user_perms(self, user_or_group, obj, permissions):
+ # Only used on Model.get_permissions to translate permissions to LDP
+ return [perm for perm in permissions if perm in self.user_permissions(user_or_group, obj)]
-class AnonymousReadOnly(WACPermissions):
- """
- Anonymous users: can read all posts
- Logged in users: can read all posts + create new posts
- Author: can read all posts + create new posts + update their own
- """
- anonymous_perms = ['view']
- authenticated_perms = ['view', 'add']
- author_perms = ['view', 'add', 'change', 'control', 'delete']
+ perms_map = {
+ 'GET': ['%(app_label)s.view_%(model_name)s'],
+ 'OPTIONS': [],
+ 'HEAD': [],
+ 'POST': ['%(app_label)s.add_%(model_name)s'],
+ 'PUT': ['%(app_label)s.change_%(model_name)s'],
+ 'PATCH': ['%(app_label)s.change_%(model_name)s'],
+ 'DELETE': ['%(app_label)s.delete_%(model_name)s'],
+ }
- def has_permission(self, request, view):
- if view.action in ['list', 'retrieve']:
- return True
- elif view.action in ['create', 'update', 'partial_update'] and request.user.is_authenticated():
- return True
- else:
- return super().has_permission(request, view)
+ def get_permissions(self, method, obj):
+ """
+ Translate perms_map to request
+ """
+ kwargs = {
+ 'app_label': obj._meta.app_label,
+ 'model_name': obj._meta.model_name
+ }
- def has_object_permission(self, request, view, obj):
- if view.action == "create" and request.user.is_authenticated():
- return True
- elif view.action in ["list", "retrieve"]:
- return True
- elif view.action in ['update', 'partial_update', 'destroy']:
- if hasattr(obj._meta, 'auto_author') and getattr(obj, Model.get_meta(obj, 'auto_author')) == request.user:
- return True
- return super().has_object_permission(request, view, obj)
+ # Only allows methods that are on perms_map
+ if method not in self.perms_map:
+ raise PermissionDenied
- def user_permissions(self, user, obj):
- if user.is_anonymous():
- return self.anonymous_perms
- else:
- if hasattr(obj._meta, 'auto_author') and getattr(obj, Model.get_meta(obj, 'auto_author')) == user:
- return self.author_perms
- else:
- return self.authenticated_perms
+ return [perm % kwargs for perm in self.perms_map[method]]
+ def has_permission(self, request, view):
+ """
+ Access to containers
+ """
+ perms = self.get_permissions(request.method, view.model)
-class LoggedReadOnly(WACPermissions):
- """
- Anonymous users: Nothing
- Logged in users: can read all posts
- """
+ # A bit tricky, but feels redondant to redeclarate perms_map
+ requested = self.get_permissions(request.method, view.model)[0].split('.')[1].split('_')[0]
- anonymous_perms = []
- authenticated_perms = ['view']
+ if not requested in self.user_permissions(request.user, view.model):
+ return False
+
+ return True
- def has_permission(self, request, view):
- if view.action in ['list', 'retrieve'] and request.user.is_authenticated():
- return True
- else:
- return super().has_permission(request, view)
def has_object_permission(self, request, view, obj):
- if view.action in ["list", "retrieve"] and request.user.is_authenticated():
- return True
- else:
- return super().has_object_permission(request, view, obj)
+ """
+ Access to objects
+ User have permission on request: Continue
+ User does not have permission: 403
+ """
+ perms = self.get_permissions(request.method, obj)
- def user_permissions(self, user, obj):
- if user.is_anonymous():
- return self.anonymous_perms
- else:
- return self.authenticated_perms
+ if not request.user.has_perms(perms, obj):
+
+ read_perms = self.get_permissions('GET', obj)
+ return PermissionDenied
+
+ return True
\ No newline at end of file