Backport ACL computation improvements

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-04 03:27:30 -04:00
parent d271f1503d
commit 8e731d6280
61 changed files with 701 additions and 609 deletions

View File

@@ -35,7 +35,7 @@ class APIResolvedSmartLinkDocumentListView(generics.ListAPIView):
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_view,
obj=document, permissions=(permission_document_view,),
user=self.request.user
)
@@ -48,7 +48,7 @@ class APIResolvedSmartLinkDocumentListView(generics.ListAPIView):
)
AccessControlList.objects.check_access(
obj=smart_link, permissions=permission_smart_link_view,
obj=smart_link, permissions=(permission_smart_link_view,),
user=self.request.user
)
@@ -91,7 +91,7 @@ class APIResolvedSmartLinkView(generics.RetrieveAPIView):
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_view,
obj=document, permissions=(permission_document_view,),
user=self.request.user
)
@@ -128,7 +128,7 @@ class APIResolvedSmartLinkListView(generics.ListAPIView):
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_view,
obj=document, permissions=(permission_document_view,),
user=self.request.user
)
@@ -187,7 +187,7 @@ class APISmartLinkConditionListView(generics.ListCreateAPIView):
smart_link = get_object_or_404(klass=SmartLink, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=smart_link, permissions=permission_required,
obj=smart_link, permissions=(permission_required,),
user=self.request.user
)
@@ -230,7 +230,7 @@ class APISmartLinkConditionView(generics.RetrieveUpdateDestroyAPIView):
smart_link = get_object_or_404(klass=SmartLink, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=smart_link, permissions=permission_required,
obj=smart_link, permissions=(permission_required,),
user=self.request.user
)

View File

@@ -88,12 +88,12 @@ class ResolvedSmartLinkView(DocumentListView):
)
AccessControlList.objects.check_access(
obj=self.document, permissions=permission_document_view,
obj=self.document, permissions=(permission_document_view,),
user=request.user
)
AccessControlList.objects.check_access(
obj=self.smart_link, permissions=permission_smart_link_view,
obj=self.smart_link, permissions=(permission_smart_link_view,),
user=request.user
)
@@ -109,8 +109,9 @@ class ResolvedSmartLinkView(DocumentListView):
try:
AccessControlList.objects.check_access(
obj=self.smart_link, permissions=permission_smart_link_edit,
user=self.request.user,
obj=self.smart_link,
permissions=(permission_smart_link_edit,),
user=self.request.user
)
except PermissionDenied:
pass
@@ -205,7 +206,7 @@ class DocumentSmartLinkListView(SmartLinkListView):
self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=self.document, permissions=permission_document_view,
obj=self.document, permissions=(permission_document_view,),
user=request.user
)
@@ -319,7 +320,8 @@ class SmartLinkConditionCreateView(SingleObjectCreateView):
def dispatch(self, request, *args, **kwargs):
AccessControlList.objects.check_access(
obj=self.get_smart_link(), permissions=permission_smart_link_edit,
obj=self.get_smart_link(),
permissions=(permission_smart_link_edit,),
user=request.user
)
@@ -359,7 +361,7 @@ class SmartLinkConditionEditView(SingleObjectEditView):
def dispatch(self, request, *args, **kwargs):
AccessControlList.objects.check_access(
obj=self.get_object().smart_link,
permissions=permission_smart_link_edit, user=request.user
permissions=(permission_smart_link_edit,), user=request.user
)
return super(
@@ -388,7 +390,7 @@ class SmartLinkConditionDeleteView(SingleObjectDeleteView):
def dispatch(self, request, *args, **kwargs):
AccessControlList.objects.check_access(
obj=self.get_object().smart_link,
permissions=permission_smart_link_edit, user=request.user
permissions=(permission_smart_link_edit,), user=request.user
)
return super(