Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SCKAN-341 fix: Update isOwner permission to check for related entity … #352

Merged
merged 2 commits into from
Nov 6, 2024
Merged

SCKAN-341 fix: Update isOwner permission to check for related entity … #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a77f9
SCKAN-341 fix: Update isOwner permission to check for related entity …
afonsobspinto Nov 6, 2024
6f56191
SCKAN-323 fix: Add missing Notes permission
afonsobspinto Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions backend/composer/api/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ def has_permission(self, request, view):
if request.method in permissions.SAFE_METHODS:
return True

# Checks if creator is the owner of the related entity (if related entity exists)
if request.method == 'POST':
# If creating a new instance, ensure related entity ownership
if request.method == 'POST' and view.action == 'create':
return check_related_entity_ownership(request)

# For unsafe methods (PATCH, PUT, DELETE), allow only authenticated users
Expand Down Expand Up @@ -59,25 +59,6 @@ def has_object_permission(self, request, view, obj):
return obj.connectivity_statement.owner == request.user


class IsSentenceOrStatementOwnerOrSystemUserOrReadOnly(permissions.BasePermission):
"""
Custom permission to allow:
- System user to bypass all checks.
- Only the owner of a sentence or connectivity statement can create a note.
"""

def has_permission(self, request, view):
# Allow system user to bypass all checks
if request.user.username == 'system' and request.user.is_staff:
return True

# Allow read-only access (GET, HEAD, OPTIONS)
if request.method in permissions.SAFE_METHODS:
return True

# For POST (create), PUT, PATCH (update), or DELETE, check ownership
return check_related_entity_ownership(request)


def check_related_entity_ownership(request):
"""
Expand Down
5 changes: 3 additions & 2 deletions backend/composer/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
BaseConnectivityStatementSerializer,
)
from .permissions import (
IsSentenceOrStatementOwnerOrSystemUserOrReadOnly,
IsStaffUserIfExportedStateInConnectivityStatement,
IsOwnerOrAssignOwnerOrCreateOrReadOnly,
IsOwnerOfConnectivityStatementOrReadOnly,
Expand Down Expand Up @@ -321,7 +320,9 @@ class NoteViewSet(viewsets.ModelViewSet):

queryset = Note.objects.all()
serializer_class = NoteSerializer
permission_classes = []
permission_classes = [
permissions.IsAuthenticatedOrReadOnly,
]
filterset_class = NoteFilter


Expand Down