Ruff: Add and fix A002 (#11646)

Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>

Author: kiblik

dojo/api_v2/permissions.py

@@ -40,20 +40,20 @@ def check_post_permission(request, post_model, post_pk, post_permission):
 
 def check_object_permission(
     request,
-    object,
+    obj,
     get_permission,
     put_permission,
     delete_permission,
     post_permission=None,
 ):
     if request.method == "GET":
-        return user_has_permission(request.user, object, get_permission)
+        return user_has_permission(request.user, obj, get_permission)
     if request.method == "PUT" or request.method == "PATCH":
-        return user_has_permission(request.user, object, put_permission)
+        return user_has_permission(request.user, obj, put_permission)
     if request.method == "DELETE":
-        return user_has_permission(request.user, object, delete_permission)
+        return user_has_permission(request.user, obj, delete_permission)
     if request.method == "POST":
-        return user_has_permission(request.user, object, post_permission)
+        return user_has_permission(request.user, obj, post_permission)
     return False
 
 

dojo/api_v2/views.py

@@ -2433,7 +2433,7 @@ class UserProfileView(GenericAPIView):
     @action(
         detail=True, methods=["get"], filter_backends=[], pagination_class=None,
     )
-    def get(self, request, format=None):
+    def get(self, request, _=None):
         user = get_current_user()
         user_contact_info = (
             user.usercontactinfo if hasattr(user, "usercontactinfo") else None

dojo/benchmark/views.py

@@ -191,16 +191,16 @@ def score_asvs(product, benchmark_type):
 
 
 @user_is_authorized(Product, Permissions.Benchmark_Edit, "pid")
-def benchmark_view(request, pid, type, cat=None):
+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=type)
+    benchmark_type = get_object_or_404(Benchmark_Type, id=benchmark_type)
     benchmark_category = Benchmark_Category.objects.filter(
-        type=type, enabled=True,
+        type=benchmark_type, enabled=True,
     ).order_by("name")
 
     # Add requirements to the product
     new_benchmarks = Benchmark_Requirement.objects.filter(
-        category__type=type, category__type__enabled=True, enabled=True,
+        category__type=benchmark_type, category__type__enabled=True, enabled=True,
     ).exclude(
         id__in=Benchmark_Product.objects.filter(product=product).values_list(
             "control_id", flat=True,
@@ -290,10 +290,10 @@ def benchmark_view(request, pid, type, cat=None):
 
 
 @user_is_authorized(Product, Permissions.Benchmark_Delete, "pid")
-def delete(request, pid, type):
+def delete(request, pid, benchmark_type):
     product = get_object_or_404(Product, id=pid)
     benchmark_product_summary = Benchmark_Product_Summary.objects.filter(
-        product=product, benchmark_type=type,
+        product=product, benchmark_type=benchmark_type,
     ).first()
     form = DeleteBenchmarkForm(instance=benchmark_product_summary)
 
@@ -307,7 +307,7 @@ def delete(request, pid, type):
             )
             if form.is_valid():
                 benchmark_product = Benchmark_Product.objects.filter(
-                    product=product, control__category__type=type,
+                    product=product, control__category__type=benchmark_type,
                 )
                 benchmark_product.delete()
                 benchmark_product_summary.delete()

dojo/cred/views.py

@@ -583,7 +583,7 @@ def new_cred_finding(request, fid):
 
 
 @user_is_authorized(Cred_User, Permissions.Credential_Delete, "ttid")
-def delete_cred_controller(request, destination_url, id, ttid):
+def delete_cred_controller(request, destination_url, elem_id, ttid):
     cred = Cred_Mapping.objects.filter(pk=ttid).first()
     if request.method == "POST":
         tform = CredMappingForm(request.POST, instance=cred)
@@ -637,23 +637,23 @@ def delete_cred_controller(request, destination_url, id, ttid):
 
         if destination_url == "cred":
             return HttpResponseRedirect(reverse(destination_url))
-        return HttpResponseRedirect(reverse(destination_url, args=(id, )))
+        return HttpResponseRedirect(reverse(destination_url, args=(elem_id, )))
     tform = CredMappingForm(instance=cred)
 
     add_breadcrumb(title="Delete Credential", top_level=False, request=request)
     product_tab = None
-    if id:
+    if elem_id:
         product = None
         if destination_url == "all_cred_product":
-            product = get_object_or_404(Product, id=id)
+            product = get_object_or_404(Product, id=elem_id)
         elif destination_url == "view_engagement":
-            engagement = get_object_or_404(Engagement, id=id)
+            engagement = get_object_or_404(Engagement, id=elem_id)
             product = engagement.product
         elif destination_url == "view_test":
-            test = get_object_or_404(Test, id=id)
+            test = get_object_or_404(Test, id=elem_id)
             product = test.engagement.product
         elif destination_url == "view_finding":
-            finding = get_object_or_404(Finding, id=id)
+            finding = get_object_or_404(Finding, id=elem_id)
             product = finding.test.engagement.product
         product_tab = Product_Tab(product, title="Delete Credential Mapping", tab="settings")
     return render(request, "dojo/delete_cred_all.html", {

dojo/engagement/views.py

@@ -1540,9 +1540,9 @@ def engagement_ics(request, eid):
     return response
 
 
-def get_list_index(list, index):
+def get_list_index(full_list, index):
     try:
-        element = list[index]
+        element = full_list[index]
     except Exception:
         element = None
     return element

dojo/jira_link/helper.py

@@ -766,7 +766,7 @@ def prepare_jira_issue_fields(
 
 
 def add_jira_issue(obj, *args, **kwargs):
-    def failure_to_add_message(message: str, exception: Exception, object: Any) -> bool:
+    def failure_to_add_message(message: str, exception: Exception, _: Any) -> bool:
         if exception:
             logger.exception(exception)
         logger.error(message)

dojo/management/commands/test_celery_decorator.py

@@ -49,8 +49,8 @@ def handle(self, *args, **options):
         # the outside decorator only outside
 
 
-def test2(clazz, id):
-    model = clazz.objects.get(id=id)
+def test2(clazz, clazz_id):
+    model = clazz.objects.get(id=clazz_id)
     logger.debug(model)
 
 

dojo/notes/views.py

@@ -20,8 +20,8 @@
 logger = logging.getLogger(__name__)
 
 
-def delete_note(request, id, page, objid):
-    note = get_object_or_404(Notes, id=id)
+def delete_note(request, note_id, page, objid):
+    note = get_object_or_404(Notes, id=note_id)
     reverse_url = None
     object_id = None
 
@@ -64,8 +64,8 @@ def delete_note(request, id, page, objid):
     return HttpResponseRedirect(reverse(reverse_url, args=(object_id, )))
 
 
-def edit_note(request, id, page, objid):
-    note = get_object_or_404(Notes, id=id)
+def edit_note(request, note_id, page, objid):
+    note = get_object_or_404(Notes, id=note_id)
     reverse_url = None
     object_id = None
 
@@ -142,8 +142,8 @@ def edit_note(request, id, page, objid):
         })
 
 
-def note_history(request, id, page, objid):
-    note = get_object_or_404(Notes, id=id)
+def note_history(request, elem_id, page, objid):
+    note = get_object_or_404(Notes, id=elem_id)
     reverse_url = None
     object_id = None
 

dojo/reports/views.py

@@ -650,9 +650,9 @@ def prefetch_related_endpoints_for_report(endpoints):
                                      )
 
 
-def get_list_index(list, index):
+def get_list_index(full_list, index):
     try:
-        element = list[index]
+        element = full_list[index]
     except Exception:
         element = None
     return element

dojo/settings/settings.dist.py

@@ -901,10 +901,10 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
 # https://djangosaml2.readthedocs.io/contents/setup.html#users-attributes-and-account-linking
 
 
-def saml2_attrib_map_format(dict):
+def saml2_attrib_map_format(din):
     dout = {}
-    for i in dict:
-        dout[i] = (dict[i],)
+    for i in din:
+        dout[i] = (din[i],)
     return dout