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

Don't check permissions for the target resource when canceling requests #8369

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Don't check permissions for the target resource when canceling requests #8369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions changelog.d/20240828_053041_roman_rm_extra_checks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Changed

- When cancelling a request, a user is no longer required to have
permissions to perform the original action
(<https://github.com/cvat-ai/cvat/pull/8369>)
38 changes: 1 addition & 37 deletions cvat/apps/engine/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.shortcuts import get_object_or_404
from django.conf import settings

from rest_framework.exceptions import ValidationError, PermissionDenied, NotFound
from rest_framework.exceptions import ValidationError, PermissionDenied
from rq.job import Job as RQJob

from cvat.apps.engine.rq_job_handler import is_rq_job_owner
Expand Down Expand Up @@ -1219,42 +1219,6 @@ def create(cls, request, view, obj: Optional[RQJob], iam_context: Dict):
permissions = []
if view.basename == 'request':
for scope in cls.get_scopes(request, view, obj):
if scope == cls.Scopes.CANCEL:
parsed_rq_id = obj.parsed_rq_id

permission_class, resource_scope = {
('import', 'project', 'dataset'): (ProjectPermission, ProjectPermission.Scopes.IMPORT_DATASET),
('import', 'project', 'backup'): (ProjectPermission, ProjectPermission.Scopes.IMPORT_BACKUP),
('import', 'task', 'annotations'): (TaskPermission, TaskPermission.Scopes.IMPORT_ANNOTATIONS),
('import', 'task', 'backup'): (TaskPermission, TaskPermission.Scopes.IMPORT_BACKUP),
('import', 'job', 'annotations'): (JobPermission, JobPermission.Scopes.IMPORT_ANNOTATIONS),
('create', 'task', None): (TaskPermission, TaskPermission.Scopes.VIEW),
('export', 'project', 'annotations'): (ProjectPermission, ProjectPermission.Scopes.EXPORT_ANNOTATIONS),
('export', 'project', 'dataset'): (ProjectPermission, ProjectPermission.Scopes.EXPORT_DATASET),
('export', 'project', 'backup'): (ProjectPermission, ProjectPermission.Scopes.EXPORT_BACKUP),
('export', 'task', 'annotations'): (TaskPermission, TaskPermission.Scopes.EXPORT_ANNOTATIONS),
('export', 'task', 'dataset'): (TaskPermission, TaskPermission.Scopes.EXPORT_DATASET),
('export', 'task', 'backup'): (TaskPermission, TaskPermission.Scopes.EXPORT_BACKUP),
('export', 'job', 'annotations'): (JobPermission, JobPermission.Scopes.EXPORT_ANNOTATIONS),
('export', 'job', 'dataset'): (JobPermission, JobPermission.Scopes.EXPORT_DATASET),
}[(parsed_rq_id.action, parsed_rq_id.target, parsed_rq_id.subresource)]


resource = None
if (resource_id := parsed_rq_id.identifier) and isinstance(resource_id, int):
resource_model = {
'project': Project,
'task': Task,
'job': Job,
}[parsed_rq_id.target]

try:
resource = resource_model.objects.get(id=resource_id)
except resource_model.DoesNotExist as ex:
raise NotFound(f'The {parsed_rq_id.target!r} with specified id#{resource_id} does not exist') from ex

permissions.append(permission_class.create_base_perm(request, view, scope=resource_scope, iam_context=iam_context, obj=resource))

if scope != cls.Scopes.LIST:
user_id = request.user.id
if not is_rq_job_owner(obj, user_id):
Expand Down
Loading