Ruff: Add and fix A001

dojo/api_v2/mixins.py

@@ -20,10 +20,10 @@ class DeletePreviewModelMixin:
     )
     @action(detail=True, methods=["get"], filter_backends=[], suffix="List")
     def delete_preview(self, request, pk=None):
-        object = self.get_object()
+        obj = self.get_object()
 
         collector = NestedObjects(using=DEFAULT_DB_ALIAS)
-        collector.collect([object])
+        collector.collect([obj])
         rels = collector.nested()
 
         def flatten(elem):

dojo/api_v2/permissions.py

@@ -33,8 +33,8 @@ def check_post_permission(request, post_model, post_pk, post_permission):
         if request.data.get(post_pk) is None:
             msg = f"Unable to check for permissions: Attribute '{post_pk}' is required"
             raise ParseError(msg)
-        object = get_object_or_404(post_model, pk=request.data.get(post_pk))
-        return user_has_permission(request.user, object, post_permission)
+        obj = get_object_or_404(post_model, pk=request.data.get(post_pk))
+        return user_has_permission(request.user, obj, post_permission)
     return True
 
 
@@ -158,29 +158,29 @@ def has_permission(self, request, view):
             has_permission_result = True
             product_id = request.data.get("product", None)
             if product_id:
-                object = get_object_or_404(Product, pk=product_id)
+                obj = get_object_or_404(Product, pk=product_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Product_Edit,
+                        request.user, obj, Permissions.Product_Edit,
                     )
                 )
             finding_id = request.data.get("finding", None)
             if finding_id:
-                object = get_object_or_404(Finding, pk=finding_id)
+                obj = get_object_or_404(Finding, pk=finding_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Finding_Edit,
+                        request.user, obj, Permissions.Finding_Edit,
                     )
                 )
             endpoint_id = request.data.get("endpoint", None)
             if endpoint_id:
-                object = get_object_or_404(Endpoint, pk=endpoint_id)
+                obj = get_object_or_404(Endpoint, pk=endpoint_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Endpoint_Edit,
+                        request.user, obj, Permissions.Endpoint_Edit,
                     )
                 )
             return has_permission_result
@@ -744,20 +744,20 @@ def has_permission(self, request, view):
             has_permission_result = True
             engagement_id = request.data.get("engagement", None)
             if engagement_id:
-                object = get_object_or_404(Engagement, pk=engagement_id)
+                obj = get_object_or_404(Engagement, pk=engagement_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Engagement_Edit,
+                        request.user, obj, Permissions.Engagement_Edit,
                     )
                 )
             product_id = request.data.get("product", None)
             if product_id:
-                object = get_object_or_404(Product, pk=product_id)
+                obj = get_object_or_404(Product, pk=product_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Product_Edit,
+                        request.user, obj, Permissions.Product_Edit,
                     )
                 )
             return has_permission_result
@@ -798,29 +798,29 @@ def has_permission(self, request, view):
             has_permission_result = True
             engagement_id = request.data.get("engagement", None)
             if engagement_id:
-                object = get_object_or_404(Engagement, pk=engagement_id)
+                obj = get_object_or_404(Engagement, pk=engagement_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Engagement_Edit,
+                        request.user, obj, Permissions.Engagement_Edit,
                     )
                 )
             finding_id = request.data.get("finding", None)
             if finding_id:
-                object = get_object_or_404(Finding, pk=finding_id)
+                obj = get_object_or_404(Finding, pk=finding_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Finding_Edit,
+                        request.user, obj, Permissions.Finding_Edit,
                     )
                 )
             finding_group_id = request.data.get("finding_group", None)
             if finding_group_id:
-                object = get_object_or_404(Finding_Group, pk=finding_group_id)
+                obj = get_object_or_404(Finding_Group, pk=finding_group_id)
                 has_permission_result = (
                     has_permission_result
                     and user_has_permission(
-                        request.user, object, Permissions.Finding_Group_Edit,
+                        request.user, obj, Permissions.Finding_Group_Edit,
                     )
                 )
             return has_permission_result

dojo/decorators.py

@@ -66,9 +66,8 @@ def __wrapper__(*args, **kwargs):
             if model_or_id:
                 if isinstance(model_or_id, models.Model) and we_want_async(*args, func=func, **kwargs):
                     logger.debug("converting model_or_id to id: %s", model_or_id)
-                    id = model_or_id.id
                     args = list(args)
-                    args[parameter] = id
+                    args[parameter] = model_or_id.id
 
             return func(*args, **kwargs)
 

dojo/filters.py

@@ -103,8 +103,8 @@
 
 def custom_filter(queryset, name, value):
     values = value.split(",")
-    filter = (f"{name}__in")
-    return queryset.filter(Q(**{filter: values}))
+    cust_filter = (f"{name}__in")
+    return queryset.filter(Q(**{cust_filter: values}))
 
 
 def custom_vulnerability_id_filter(queryset, name, value):

dojo/jira_link/helper.py

@@ -572,12 +572,12 @@ def get_labels(obj):
 
     if system_settings.add_vulnerability_id_to_jira_label or (jira_project and jira_project.add_vulnerability_id_to_jira_label):
         if isinstance(obj, Finding) and obj.vulnerability_ids:
-            for id in obj.vulnerability_ids:
-                labels.append(id)
+            for vul_id in obj.vulnerability_ids:
+                labels.append(vul_id)
         elif isinstance(obj, Finding_Group):
             for finding in obj.findings.all():
-                for id in finding.vulnerability_ids:
-                    labels.append(id)
+                for vul_id in finding.vulnerability_ids:
+                    labels.append(vul_id)
 
     return labels
 

dojo/models.py

@@ -941,8 +941,8 @@ def clean(self):
                self.finding_id]
         ids_count = 0
 
-        for id in ids:
-            if id is not None:
+        for obj_id in ids:
+            if obj_id is not None:
                 ids_count += 1
 
         if ids_count == 0:

dojo/notes/views.py

@@ -26,28 +26,28 @@ def delete_note(request, id, page, objid):
     object_id = None
 
     if page == "engagement":
-        object = get_object_or_404(Engagement, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Engagement, id=objid)
+        object_id = obj.id
         reverse_url = "view_engagement"
     elif page == "test":
-        object = get_object_or_404(Test, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Test, id=objid)
+        object_id = obj.id
         reverse_url = "view_test"
     elif page == "finding":
-        object = get_object_or_404(Finding, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Finding, id=objid)
+        object_id = obj.id
         reverse_url = "view_finding"
     elif page == "cred":
-        object = get_object_or_404(Cred_User, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Cred_User, id=objid)
+        object_id = obj.id
         reverse_url = "view_cred_details"
 
     form = DeleteNoteForm(request.POST, instance=note)
 
     if page is None:
         raise PermissionDenied
     if str(request.user) != note.author.username:
-        user_has_permission_or_403(request.user, object, Permissions.Note_Delete)
+        user_has_permission_or_403(request.user, obj, Permissions.Note_Delete)
 
     if form.is_valid():
         note.delete()
@@ -73,24 +73,24 @@ def edit_note(request, id, page, objid):
         raise PermissionDenied
 
     if page == "engagement":
-        object = get_object_or_404(Engagement, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Engagement, id=objid)
+        object_id = obj.id
         reverse_url = "view_engagement"
     elif page == "test":
-        object = get_object_or_404(Test, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Test, id=objid)
+        object_id = obj.id
         reverse_url = "view_test"
     elif page == "finding":
-        object = get_object_or_404(Finding, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Finding, id=objid)
+        object_id = obj.id
         reverse_url = "view_finding"
 
     if str(request.user) != note.author.username:
-        user_has_permission_or_403(request.user, object, Permissions.Note_Edit)
+        user_has_permission_or_403(request.user, obj, Permissions.Note_Edit)
 
     note_type_activation = Note_Type.objects.filter(is_active=True).count()
     if note_type_activation:
-        available_note_types = find_available_notetypes(object, note)
+        available_note_types = find_available_notetypes(obj, note)
 
     if request.method == "POST":
         if note_type_activation:
@@ -114,9 +114,9 @@ def edit_note(request, id, page, objid):
             history.save()
             note.history.add(history)
             note.save()
-            object.last_reviewed = note.date
-            object.last_reviewed_by = request.user
-            object.save()
+            obj.last_reviewed = note.date
+            obj.last_reviewed_by = request.user
+            obj.save()
             form = NoteForm()
             messages.add_message(request,
                                 messages.SUCCESS,
@@ -148,22 +148,22 @@ def note_history(request, id, page, objid):
     object_id = None
 
     if page == "engagement":
-        object = get_object_or_404(Engagement, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Engagement, id=objid)
+        object_id = obj.id
         reverse_url = "view_engagement"
     elif page == "test":
-        object = get_object_or_404(Test, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Test, id=objid)
+        object_id = obj.id
         reverse_url = "view_test"
     elif page == "finding":
-        object = get_object_or_404(Finding, id=objid)
-        object_id = object.id
+        obj = get_object_or_404(Finding, id=objid)
+        object_id = obj.id
         reverse_url = "view_finding"
 
     if page is None:
         raise PermissionDenied
     if str(request.user) != note.author.username:
-        user_has_permission_or_403(request.user, object, Permissions.Note_View_History)
+        user_has_permission_or_403(request.user, obj, Permissions.Note_View_History)
 
     history = note.history.all()
 

dojo/object/views.py

@@ -57,14 +57,14 @@ def view_objects(request, pid):
 
 @user_is_authorized(Product, Permissions.Product_Tracking_Files_Edit, "pid")
 def edit_object(request, pid, ttid):
-    object = Objects_Product.objects.get(pk=ttid)
+    object_prod = Objects_Product.objects.get(pk=ttid)
     product = get_object_or_404(Product, id=pid)
-    if object.product != product:
-        msg = f"Product {pid} does not fit to product of Object {object.product.id}"
+    if object_prod.product != product:
+        msg = f"Product {pid} does not fit to product of Object {object_prod.product.id}"
         raise BadRequest(msg)
 
     if request.method == "POST":
-        tform = ObjectSettingsForm(request.POST, instance=object)
+        tform = ObjectSettingsForm(request.POST, instance=object_prod)
         if tform.is_valid():
             tform.save()
 
@@ -74,7 +74,7 @@ def edit_object(request, pid, ttid):
                                  extra_tags="alert-success")
             return HttpResponseRedirect(reverse("view_objects", args=(pid,)))
     else:
-        tform = ObjectSettingsForm(instance=object)
+        tform = ObjectSettingsForm(instance=object_prod)
 
     product_tab = Product_Tab(product, title="Edit Tracked Files", tab="settings")
     return render(request,
@@ -87,21 +87,21 @@ def edit_object(request, pid, ttid):
 
 @user_is_authorized(Product, Permissions.Product_Tracking_Files_Delete, "pid")
 def delete_object(request, pid, ttid):
-    object = Objects_Product.objects.get(pk=ttid)
+    object_prod = Objects_Product.objects.get(pk=ttid)
     product = get_object_or_404(Product, id=pid)
-    if object.product != product:
-        msg = f"Product {pid} does not fit to product of Object {object.product.id}"
+    if object_prod.product != product:
+        msg = f"Product {pid} does not fit to product of Object {object_prod.product.id}"
         raise BadRequest(msg)
 
     if request.method == "POST":
-        tform = ObjectSettingsForm(request.POST, instance=object)
-        object.delete()
+        tform = ObjectSettingsForm(request.POST, instance=object_prod)
+        object_prod.delete()
         messages.add_message(request,
                              messages.SUCCESS,
                              "Tracked Product Files Deleted.",
                              extra_tags="alert-success")
         return HttpResponseRedirect(reverse("view_objects", args=(pid,)))
-    tform = DeleteObjectsSettingsForm(instance=object)
+    tform = DeleteObjectsSettingsForm(instance=object_prod)
 
     product_tab = Product_Tab(product, title="Delete Product Tool Configuration", tab="settings")
     return render(request,

dojo/survey/views.py

@@ -468,8 +468,8 @@ def create_question(request):
         choiceQuestionFrom = CreateChoiceQuestionForm(request.POST)
 
         if form.is_valid():
-            type = form.cleaned_data["type"]
-            if type == "text":
+            question_type = form.cleaned_data["type"]
+            if question_type == "text":
                 if textQuestionForm.is_valid():
                     created_question = TextQuestion.objects.create(
                         optional=form.cleaned_data["optional"],
@@ -483,7 +483,7 @@ def create_question(request):
                     return HttpResponseRedirect(reverse("questions"))
                 error = True
 
-            elif type == "choice":
+            elif question_type == "choice":
                 if choiceQuestionFrom.is_valid():
                     created_question = ChoiceQuestion.objects.create(
                         optional=form.cleaned_data["optional"],
@@ -537,19 +537,19 @@ def edit_question(request, qid):
                 "This question is part of an already answered survey. If you change it, the responses "
                 "may no longer be valid.",
                 extra_tags="alert-info")
-    type = str(ContentType.objects.get_for_model(question))
+    content_type = str(ContentType.objects.get_for_model(question))
 
-    if type == "dojo | text question":
+    if content_type == "dojo | text question":
         form = EditTextQuestionForm(instance=question)
-    elif type == "dojo | choice question":
+    elif content_type == "dojo | choice question":
         form = EditChoiceQuestionForm(instance=question)
     else:
         raise Http404
 
     if request.method == "POST":
-        if type == "dojo | text question":
+        if content_type == "dojo | text question":
             form = EditTextQuestionForm(request.POST, instance=question)
-        elif type == "dojo | choice question":
+        elif content_type == "dojo | choice question":
             form = EditChoiceQuestionForm(request.POST, instance=question)
         else:
             raise Http404