Skip to content

Commit 424b95e

Browse files
committed
Update stale dojo.api_v2.permissions imports after RBAC refactor
Phase 2 of perm-cleanup moved DRF permissions to dojo/authorization/api_permissions.py, but three callsites that arrived via the dev merge still pointed at the old location: - dojo/risk_acceptance/api.py (UserHasRiskAcceptanceRelatedObjectPermission, added in DefectDojo#14632) - dojo/jira/api/views.py (`from dojo.api_v2 import permissions`, added by the dev jira-package refactor DefectDojo#14743) - unittests/test_rest_framework.py (`@patch("dojo.api_v2.permissions...")`) Without these the URL config fails to import and every CI job 500s during app startup.
1 parent d29aca5 commit 424b95e

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

dojo/jira/api/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from drf_spectacular.utils import extend_schema_view
33
from rest_framework.permissions import IsAuthenticated
44

5-
from dojo.api_v2 import permissions
65
from dojo.api_v2.views import DojoModelViewSet, PrefetchDojoModelViewSet, schema_with_prefetch
6+
from dojo.authorization import api_permissions as permissions
77
from dojo.authorization.roles_permissions import Permissions
88
from dojo.jira.api.serializers import (
99
JIRAInstanceSerializer,

dojo/risk_acceptance/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from rest_framework.permissions import IsAuthenticated
1111
from rest_framework.response import Response
1212

13-
from dojo.api_v2.permissions import UserHasRiskAcceptanceRelatedObjectPermission
1413
from dojo.api_v2.serializers import RiskAcceptanceSerializer
14+
from dojo.authorization.api_permissions import UserHasRiskAcceptanceRelatedObjectPermission
1515
from dojo.authorization.roles_permissions import Permissions
1616
from dojo.engagement.queries import get_authorized_engagements
1717
from dojo.models import Engagement, Risk_Acceptance, User, Vulnerability_Id

unittests/test_rest_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3435,7 +3435,7 @@ def test_create_not_authorized_product_name_engagement_name_scan_type_title(self
34353435

34363436
@patch("dojo.importers.default_reimporter.DefaultReImporter.process_scan")
34373437
@patch("dojo.importers.default_importer.DefaultImporter.process_scan")
3438-
@patch("dojo.api_v2.permissions.user_has_permission")
3438+
@patch("dojo.authorization.api_permissions.user_has_permission")
34393439
def test_reimport_engagement_param_ignored_permission_checked_on_name_resolved_target(self, mock, importer_mock, reimporter_mock):
34403440
"""
34413441
Engagement is not a declared field on ReImportScanSerializer — verify

0 commit comments

Comments
 (0)