⬆️ Bump ruff to 0.13.2 (#13267)

Author: manuel-sommer

dojo/importers/endpoint_manager.py

@@ -84,7 +84,7 @@ def reactivate_endpoint_status(
         for endpoint_status in endpoint_status_list:
             # Only reactivate endpoints that are actually mitigated
             if endpoint_status.mitigated:
-                logger.debug("Re-import: reactivating endpoint %s that is present in this scan", str(endpoint_status.endpoint))
+                logger.debug("Re-import: reactivating endpoint %s that is present in this scan", endpoint_status.endpoint)
                 endpoint_status.mitigated_by = None
                 endpoint_status.mitigated_time = None
                 endpoint_status.mitigated = False

dojo/jira_link/helper.py

@@ -1649,7 +1649,7 @@ def process_jira_project_form(request, instance=None, target=None, product=None,
     # jform = JIRAProjectForm(request.POST, instance=instance if instance else JIRA_Project(), product=product)
     jform = JIRAProjectForm(request.POST, instance=instance, target=target, product=product, engagement=engagement)
     # logging has_changed because it sometimes doesn't do what we expect
-    logger.debug("jform has changed: %s", str(jform.has_changed()))
+    logger.debug("jform has changed: %s", jform.has_changed())
 
     if jform.has_changed():  # if no data was changed, no need to do anything!
         logger.debug("jform changed_data: %s", jform.changed_data)

dojo/middleware.py

@@ -62,7 +62,7 @@ def __call__(self, request):
                 return HttpResponseRedirect(fullURL)
 
         if request.user.is_authenticated:
-            logger.debug("Authenticated user: %s", str(request.user))
+            logger.debug("Authenticated user: %s", request.user)
             with suppress(ModuleNotFoundError):  # to avoid unittests to fail
                 uwsgi = __import__("uwsgi", globals(), locals(), ["set_logvar"], 0)
                 # this populates dd_user log var, so can appear in the uwsgi logs

dojo/pipeline.py

@@ -114,18 +114,18 @@ def assign_user_to_groups(user, group_names, social_provider):
     for group_name in group_names:
         group, created_group = Dojo_Group.objects.get_or_create(name=group_name, social_provider=social_provider)
         if created_group:
-            logger.debug("Group %s for social provider %s was created", str(group), social_provider)
+            logger.debug("Group %s for social provider %s was created", group, social_provider)
         _group_member, is_member_created = Dojo_Group_Member.objects.get_or_create(group=group, user=user, defaults={
             "role": Role.objects.get(id=Roles.Maintainer)})
         if is_member_created:
-            logger.debug("User %s become member of group %s (social provider: %s)", user, str(group), social_provider)
+            logger.debug("User %s become member of group %s (social provider: %s)", user, group, social_provider)
 
 
 def cleanup_old_groups_for_user(user, group_names):
     for group_member in Dojo_Group_Member.objects.select_related("group").filter(user=user):
         group = group_member.group
         if str(group) not in group_names:
-            logger.debug("Deleting membership of user %s from %s group %s", user, group.social_provider, str(group))
+            logger.debug("Deleting membership of user %s from %s group %s", user, group.social_provider, group)
             group_member.delete()
 
 

dojo/tools/ms_defender/parser.py

@@ -31,7 +31,7 @@ def get_findings(self, file, test):
                 vulnerabilitydata = vulnerabilityfile["value"]
                 findings.extend(self.process_json(vulnerability) for vulnerability in vulnerabilitydata)
             except (json.JSONDecodeError, KeyError) as e:
-                logger.warning("Error parsing JSON file %s: %s", file.name, str(e))
+                logger.warning("Error parsing JSON file %s: %s", file.name, e)
                 return []
         elif str(file.name).endswith(".zip"):
             if str(file.__class__) == "<class '_io.TextIOWrapper'>":
@@ -71,7 +71,7 @@ def get_findings(self, file, test):
                     for data in output:
                         vulnerabilities.append(data)
                 except (json.JSONDecodeError, KeyError, UnicodeDecodeError) as e:
-                    logger.warning("Error parsing vulnerability file %s: %s", vulnerabilityfile, str(e))
+                    logger.warning("Error parsing vulnerability file %s: %s", vulnerabilityfile, e)
                     continue
 
             for machinefile in machinefiles:
@@ -91,7 +91,7 @@ def get_findings(self, file, test):
                     for data in output:
                         machines[data.get("id")] = data
                 except (json.JSONDecodeError, KeyError, UnicodeDecodeError) as e:
-                    logger.warning("Error parsing machine file %s: %s", machinefile, str(e))
+                    logger.warning("Error parsing machine file %s: %s", machinefile, e)
                     continue
             for vulnerability in vulnerabilities:
                 try:

dojo/tools/nuclei/parser.py

@@ -41,7 +41,7 @@ def get_findings(self, filename, test):
             data.extend(json.loads(line) for line in file if line)
         dupes = {}
         for item in data:
-            logger.debug("Item %s.", str(item))
+            logger.debug("Item %s.", item)
             template_id = item.get("templateID", item.get("template-id", ""))
             info = item.get("info")
             name = info.get("name")
@@ -148,7 +148,7 @@ def get_findings(self, filename, test):
             ).hexdigest()
 
             if dupe_key in dupes:
-                logger.debug("dupe_key %s exists.", str(dupe_key))
+                logger.debug("dupe_key %s exists.", dupe_key)
                 finding = dupes[dupe_key]
                 if endpoint not in finding.unsaved_endpoints:
                     finding.unsaved_endpoints.append(endpoint)

requirements-lint.txt

@@ -1 +1 @@
-ruff==0.13.1
+ruff==0.13.2

ruff.toml

@@ -113,6 +113,9 @@ preview = true
     "S105",  # hardcoded passwords in tests are fine
     "S108",  # tmp paths mentioned in tests are fine
 ]
+"dojo/filters.py" = [
+    "A003",  # ruff upgrade to 0.13.3
+]
 
 [lint.flake8-boolean-trap]
 extend-allowed-calls = ["dojo.utils.get_system_setting"]

unittests/test_deduplication_logic.py

@@ -1267,7 +1267,7 @@ def assert_finding(self, finding, not_pk=None, *, duplicate=False, duplicate_fin
 
     def set_dedupe_inside_engagement(self, deduplication_on_engagement):
         for eng in Engagement.objects.all():
-            logger.debug("setting deduplication_on_engagment to %s for %i", str(deduplication_on_engagement), eng.id)
+            logger.debug("setting deduplication_on_engagment to %s for %i", deduplication_on_engagement, eng.id)
             eng.deduplication_on_engagement = deduplication_on_engagement
             eng.save()
 

unittests/test_false_positive_history_logic.py

@@ -1825,7 +1825,7 @@ def assert_finding(self, finding, false_p, duplicate=None, not_pk=None,
 
     def set_dedupe_inside_engagement(self, deduplication_on_engagement):
         for eng in Engagement.objects.all():
-            logger.debug("setting deduplication_on_engagment to %s for %i", str(deduplication_on_engagement), eng.id)
+            logger.debug("setting deduplication_on_engagment to %s for %i", deduplication_on_engagement, eng.id)
             eng.deduplication_on_engagement = deduplication_on_engagement
             eng.save()