Fix ruff lint issues across modified files

- Replace lambda fallbacks with def (E731)
- Rename _impl to impl (RUF052)
- Fix undefined name references in models.py (F821) by using string FK
  reference and adding late import for admin registrations
- Auto-fix import sorting and formatting (I001)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Maffooch

dojo/announcement/views.py

@@ -13,6 +13,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 def configure_announcement(request):
     remove = False
     if request.method == "GET":
@@ -62,6 +63,7 @@ def configure_announcement(request):
         request, "dojo/announcement.html", {"form": form, "remove": remove},
     )
 
+
 def dismiss_announcement(request):
     if request.method == "POST":
         deleted_count, _objects_deleted = UserAnnouncement.objects.filter(

dojo/api_v2/serializers.py

@@ -27,6 +27,15 @@
 import dojo.jira_link.helper as jira_helper
 import dojo.risk_acceptance.helper as ra_helper
 from dojo.authorization.authorization import user_has_permission
+from dojo.authorization.models import (
+    Dojo_Group_Member,
+    Global_Role,
+    Product_Group,
+    Product_Member,
+    Product_Type_Group,
+    Product_Type_Member,
+    Role,
+)
 from dojo.authorization.roles_permissions import Permissions
 from dojo.endpoint.utils import endpoint_filter, endpoint_meta_import
 from dojo.finding.helper import (
@@ -40,15 +49,6 @@
 from dojo.importers.base_importer import BaseImporter
 from dojo.importers.default_importer import DefaultImporter
 from dojo.importers.default_reimporter import DefaultReImporter
-from dojo.authorization.models import (
-    Dojo_Group_Member,
-    Global_Role,
-    Product_Group,
-    Product_Member,
-    Product_Type_Group,
-    Product_Type_Member,
-    Role,
-)
 from dojo.location.models import Location, LocationFindingReference
 from dojo.models import (
     DEFAULT_NOTIFICATION,

dojo/api_v2/views.py

@@ -45,9 +45,18 @@
     prefetch,
     serializers,
 )
-from dojo.authorization import api_permissions as permissions
 from dojo.api_v2.prefetch.prefetcher import _Prefetcher
+from dojo.authorization import api_permissions as permissions
 from dojo.authorization.authorization import user_has_permission_or_403
+from dojo.authorization.models import (
+    Dojo_Group_Member,
+    Global_Role,
+    Product_Group,
+    Product_Member,
+    Product_Type_Group,
+    Product_Type_Member,
+    Role,
+)
 from dojo.authorization.roles_permissions import Permissions
 from dojo.celery_dispatch import dojo_dispatch_task
 from dojo.cred.queries import get_authorized_cred_mappings
@@ -93,15 +102,6 @@
     get_authorized_jira_projects,
 )
 from dojo.labels import get_labels
-from dojo.authorization.models import (
-    Dojo_Group_Member,
-    Global_Role,
-    Product_Group,
-    Product_Member,
-    Product_Type_Group,
-    Product_Type_Member,
-    Role,
-)
 from dojo.models import (
     Announcement,
     Answer,

dojo/asset/api/filters.py

@@ -3,6 +3,10 @@
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 
+from dojo.authorization.models import (
+    Product_Group,
+    Product_Member,
+)
 from dojo.filters import (
     CharFieldFilterANDExpression,
     CharFieldInFilter,
@@ -13,10 +17,6 @@
     ProductSLAFilter,
 )
 from dojo.labels import get_labels
-from dojo.authorization.models import (
-    Product_Group,
-    Product_Member,
-)
 from dojo.models import (
     Product,
     Product_API_Scan_Configuration,

dojo/asset/api/serializers.py

@@ -3,11 +3,11 @@
 
 from dojo.api_v2.serializers import ProductMetaSerializer, TagListSerializerField
 from dojo.authorization.authorization import user_has_permission
-from dojo.authorization.roles_permissions import Permissions
 from dojo.authorization.models import (
     Product_Group,
     Product_Member,
 )
+from dojo.authorization.roles_permissions import Permissions
 from dojo.models import (
     Dojo_User,
     Product,

dojo/asset/api/views.py

@@ -7,7 +7,6 @@
 
 import dojo.api_v2.mixins as dojo_mixins
 from dojo.api_v2 import prefetch
-from dojo.authorization import api_permissions as permissions
 from dojo.api_v2.serializers import ReportGenerateOptionSerializer, ReportGenerateSerializer
 from dojo.api_v2.views import PrefetchDojoModelViewSet, report_generate, schema_with_prefetch
 from dojo.asset.api import serializers
@@ -17,11 +16,12 @@
     AssetGroupFilterSet,
     AssetMemberFilterSet,
 )
-from dojo.authorization.roles_permissions import Permissions
+from dojo.authorization import api_permissions as permissions
 from dojo.authorization.models import (
     Product_Group,
     Product_Member,
 )
+from dojo.authorization.roles_permissions import Permissions
 from dojo.models import (
     Product,
     Product_API_Scan_Configuration,

dojo/banner/views.py

@@ -11,6 +11,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 def configure_banner(request):
     banner_config = get_object_or_404(BannerConf, id=1)
     if request.method == "POST":

dojo/benchmark/views.py

@@ -26,6 +26,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 def add_benchmark(queryset, product):
     requirements = []
     for requirement in queryset:
@@ -35,6 +36,7 @@ def add_benchmark(queryset, product):
         requirements.append(benchmark_product)
     Benchmark_Product.objects.bulk_create(requirements)
 
+
 def update_benchmark(request, pid, _type):
     if request.method == "POST":
         bench_id = request.POST.get("bench_id")
@@ -82,6 +84,7 @@ def update_benchmark(request, pid, _type):
         request, reverse("view_product_benchmark", args=(pid, _type)),
     )
 
+
 def update_benchmark_summary(request, pid, _type, summary):
     if request.method == "POST":
         product = get_object_or_404(Product, id=pid)
@@ -106,6 +109,7 @@ def update_benchmark_summary(request, pid, _type, summary):
         request, reverse("view_product_benchmark", args=(pid, _type)),
     )
 
+
 def return_score(queryset):
     asvs_level_1_benchmark = 0
     asvs_level_1_score = 0
@@ -116,6 +120,7 @@ def return_score(queryset):
 
     return asvs_level_1_benchmark, asvs_level_1_score
 
+
 def score_asvs(product, benchmark_type):
     # Compliant to ASVS level 1 benchmarks
     asvs_level_1 = (
@@ -180,6 +185,7 @@ def score_asvs(product, benchmark_type):
 
     benchmark_product_summary.save()
 
+
 def benchmark_view(request, pid, benchmark_type, cat=None):
     product = get_object_or_404(Product, id=pid)
     benchmark_type = get_object_or_404(Benchmark_Type, id=benchmark_type)
@@ -277,6 +283,7 @@ def benchmark_view(request, pid, benchmark_type, cat=None):
         },
     )
 
+
 def delete(request, pid, benchmark_type):
     product = get_object_or_404(Product, id=pid)
     benchmark_product_summary = get_object_or_404(

dojo/cred/queries.py

@@ -1,7 +1,7 @@
 try:
     from dojo.authorization.query_filters import get_auth_filter
 except ImportError:
-    get_auth_filter = lambda key: None
+    def get_auth_filter(key): return None
 
 from dojo.models import Cred_Mapping
 from dojo.request_cache import cache_for_request
@@ -10,14 +10,14 @@
 # Cached: all parameters are hashable, no dynamic queryset filtering
 @cache_for_request
 def get_authorized_cred_mappings(permission):
-    _impl = get_auth_filter("cred.get_authorized_cred_mappings")
-    if _impl:
-        return _impl(permission)
+    impl = get_auth_filter("cred.get_authorized_cred_mappings")
+    if impl:
+        return impl(permission)
     return Cred_Mapping.objects.all().order_by("id")
 
 
 def get_authorized_cred_mappings_for_queryset(permission, queryset):
-    _impl = get_auth_filter("cred.get_authorized_cred_mappings_for_queryset")
-    if _impl:
-        return _impl(permission, queryset)
+    impl = get_auth_filter("cred.get_authorized_cred_mappings_for_queryset")
+    if impl:
+        return impl(permission, queryset)
     return queryset

dojo/cred/views.py

@@ -14,6 +14,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 def new_cred(request):
     if request.method == "POST":
         tform = CredUserForm(request.POST)
@@ -34,13 +35,15 @@ def new_cred(request):
             title="New Credential", top_level=False, request=request)
     return render(request, "dojo/new_cred.html", {"tform": tform})
 
+
 def all_cred_product(request, pid):
     prod = get_object_or_404(Product, id=pid)
     creds = Cred_Mapping.objects.filter(product=prod).order_by("cred_id__name")
 
     product_tab = Product_Tab(prod, title="Credentials", tab="settings")
     return render(request, "dojo/view_cred_prod.html", {"product_tab": product_tab, "creds": creds, "prod": prod})
 
+
 def edit_cred(request, ttid):
     tool_config = Cred_User.objects.get(pk=ttid)
     if request.method == "POST":
@@ -71,6 +74,7 @@ def edit_cred(request, ttid):
         "tform": tform,
     })
 
+
 def view_cred_details(request, ttid):
     cred = Cred_User.objects.get(pk=ttid)
     notes = cred.notes.all()
@@ -107,13 +111,15 @@ def view_cred_details(request, ttid):
         "person": request.user.username,
     })
 
+
 def cred(request):
     confs = Cred_User.objects.all().order_by("name", "environment", "username")
     add_breadcrumb(title="Credential Manager", top_level=True, request=request)
     return render(request, "dojo/view_cred.html", {
         "confs": confs,
     })
 
+
 def view_cred_product(request, pid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -167,6 +173,7 @@ def view_cred_product(request, pid, ttid):
             "view_link": view_link,
         })
 
+
 def view_cred_product_engagement(request, eid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -213,6 +220,7 @@ def view_cred_product_engagement(request, eid, ttid):
             "cred_product": cred_product,
         })
 
+
 def view_cred_engagement_test(request, tid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -261,6 +269,7 @@ def view_cred_engagement_test(request, tid, ttid):
             "cred_product": cred_product,
         })
 
+
 def view_cred_finding(request, fid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -309,6 +318,7 @@ def view_cred_finding(request, fid, ttid):
             "cred_product": cred_product,
         })
 
+
 def edit_cred_product(request, pid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -334,6 +344,7 @@ def edit_cred_product(request, pid, ttid):
         "cred_type": "Product",
     })
 
+
 def edit_cred_product_engagement(request, eid, ttid):
     cred = get_object_or_404(
         Cred_Mapping.objects.select_related("cred_id"), id=ttid)
@@ -365,6 +376,7 @@ def edit_cred_product_engagement(request, eid, ttid):
         "cred_type": "Engagement",
     })
 
+
 def new_cred_product(request, pid):
     prod = get_object_or_404(Product, pk=pid)
     if request.method == "POST":
@@ -398,6 +410,7 @@ def new_cred_product(request, pid):
         "product_tab": product_tab,
     })
 
+
 def new_cred_product_engagement(request, eid):
     eng = get_object_or_404(Engagement, pk=eid)
 
@@ -447,6 +460,7 @@ def new_cred_product_engagement(request, eid):
             "formlink": reverse("new_cred_product_engagement", args=(eid, )),
         })
 
+
 def new_cred_engagement_test(request, tid):
     test = get_object_or_404(Test, pk=tid)
 
@@ -495,6 +509,7 @@ def new_cred_engagement_test(request, tid):
             "formlink": reverse("new_cred_engagement_test", args=(tid, )),
         })
 
+
 def new_cred_finding(request, fid):
     finding = get_object_or_404(Finding, pk=fid)
 
@@ -544,6 +559,7 @@ def new_cred_finding(request, fid):
             "formlink": reverse("new_cred_finding", args=(fid, )),
         })
 
+
 def delete_cred_controller(request, destination_url, elem_id, ttid):
     cred = Cred_Mapping.objects.filter(pk=ttid).first()
     if request.method == "POST":
@@ -622,17 +638,22 @@ def delete_cred_controller(request, destination_url, elem_id, ttid):
         "product_tab": product_tab,
     })
 
+
 def delete_cred(request, ttid):
     return delete_cred_controller(request, "cred", 0, ttid=ttid)
 
+
 def delete_cred_product(request, pid, ttid):
     return delete_cred_controller(request, "all_cred_product", pid, ttid)
 
+
 def delete_cred_engagement(request, eid, ttid):
     return delete_cred_controller(request, "view_engagement", eid, ttid)
 
+
 def delete_cred_test(request, tid, ttid):
     return delete_cred_controller(request, "view_test", tid, ttid)
 
+
 def delete_cred_finding(request, fid, ttid):
     return delete_cred_controller(request, "view_finding", fid, ttid)