fix(ruff): Findings from upgrade to 0.6.1 (#10775)

Author: kiblik

dojo/finding/helper.py

@@ -573,18 +573,18 @@ def fix_loop_duplicates():
     loop_count = len(candidates)
 
     if loop_count > 0:
-        deduplicationLogger.info("Identified %d Findings with Loops" % len(candidates))
+        deduplicationLogger.info(f"Identified {len(candidates)} Findings with Loops")
         for find_id in candidates.values_list("id", flat=True):
             removeLoop(find_id, 50)
 
         new_originals = Finding.objects.filter(duplicate_finding__isnull=True, duplicate=True)
         for f in new_originals:
-            deduplicationLogger.info("New Original: %d " % f.id)
+            deduplicationLogger.info(f"New Original: {f.id}")
             f.duplicate = False
             super(Finding, f).save()
 
         loop_count = Finding.objects.filter(duplicate_finding__isnull=False, original_finding__isnull=False).count()
-        deduplicationLogger.info("%d Finding found which still has Loops, please run fix loop duplicates again" % loop_count)
+        deduplicationLogger.info(f"{loop_count} Finding found which still has Loops, please run fix loop duplicates again")
     return loop_count
 
 

dojo/finding/views.py

@@ -2862,9 +2862,8 @@ def finding_bulk_update_all(request, pid=None):
                     messages.add_message(
                         request,
                         messages.WARNING,
-                        ("Skipped simple risk acceptance of %i findings, "
-                         "simple risk acceptance is disabled on the related products")
-                        % skipped_risk_accept_count,
+                        (f"Skipped simple risk acceptance of {skipped_risk_accept_count} findings, "
+                         "simple risk acceptance is disabled on the related products"),
                         extra_tags="alert-warning",
                     )
 
@@ -2963,8 +2962,7 @@ def finding_bulk_update_all(request, pid=None):
 
                     if grouped:
                         add_success_message_to_response(
-                            "Grouped %d findings into %d (%d newly created) finding groups"
-                            % (grouped, len(finding_groups), groups_created),
+                            f"Grouped {grouped} findings into {len(finding_groups)} ({groups_created} newly created) finding groups",
                         )
 
                     if skipped:
@@ -3042,15 +3040,10 @@ def finding_bulk_update_all(request, pid=None):
                             success_count += 1
 
                 for error_message, error_count in error_counts.items():
-                    add_error_message_to_response(
-                        "%i finding groups could not be pushed to JIRA: %s"
-                        % (error_count, error_message),
-                    )
+                    add_error_message_to_response("{error_count} finding groups could not be pushed to JIRA: {error_message}")
 
                 if success_count > 0:
-                    add_success_message_to_response(
-                        "%i finding groups pushed to JIRA successfully" % success_count,
-                    )
+                    add_success_message_to_response(f"{success_count} finding groups pushed to JIRA successfully")
                     groups_pushed_to_jira = True
 
                 # refresh from db
@@ -3102,15 +3095,10 @@ def finding_bulk_update_all(request, pid=None):
                             success_count += 1
 
                 for error_message, error_count in error_counts.items():
-                    add_error_message_to_response(
-                        "%i findings could not be pushed to JIRA: %s"
-                        % (error_count, error_message),
-                    )
+                    add_error_message_to_response(f"{error_count} findings could not be pushed to JIRA: {error_message}")
 
                 if success_count > 0:
-                    add_success_message_to_response(
-                        "%i findings pushed to JIRA successfully" % success_count,
-                    )
+                    add_success_message_to_response(f"{success_count} findings pushed to JIRA successfully")
 
                 if updated_find_count > 0:
                     messages.add_message(

dojo/management/commands/jira_status_reconciliation.py

@@ -59,8 +59,8 @@ def jira_status_reconciliation(*args, **kwargs):
         issue_from_jira = jira_helper.get_jira_issue_from_jira(find)
 
         if not issue_from_jira:
-            message = "%s;%s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;unable to retrieve JIRA Issue;%s" % \
-                (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), None, None, None, None,
+            message = "{};{}/finding/{};{};{};{};{};{};{};{};{};{};{};{};unable to retrieve JIRA Issue;{}".format(
+                find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), None, None, None, None,
                             find.jira_issue.jira_change, None, find.last_status_update, None, find.last_reviewed, None, "error")
             messages.append(message)
             logger.info(message)
@@ -80,27 +80,27 @@ def jira_status_reconciliation(*args, **kwargs):
         flag1, flag2, flag3 = None, None, None
 
         if mode == "reconcile" and not find.last_status_update:
-            message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;skipping finding with no last_status_update;%s" % \
-                (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), None, None, None, None,
+            message = "{}; {}/finding/{};{};{};{};{};{};{};{};{};{};{};{};skipping finding with no last_status_update;{}".format(
+                find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), None, None, None, None,
                 find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, "skipped")
             messages.append(message)
             logger.info(message)
             continue
         elif find.risk_accepted:
-            message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%sskipping risk accepted findings;%s" % \
-                (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
+            message = "{}; {}/finding/{};{};{};{};{};{};{};{};{};{};{};{}skipping risk accepted findings;{}".format(
+                find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
                 find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, "skipped")
             messages.append(message)
             logger.info(message)
         elif jira_helper.issue_from_jira_is_active(issue_from_jira) and find.active:
-            message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;no action both sides are active/open;%s" % \
-                (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
+            message = "{}; {}/finding/{};{};{};{};{};{};{};{};{};{};{};{};no action both sides are active/open;{}".format(
+                find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
                     find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, "equal")
             messages.append(message)
             logger.info(message)
         elif not jira_helper.issue_from_jira_is_active(issue_from_jira) and not find.active:
-            message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;no action both sides are inactive/closed;%s" % \
-                (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
+            message = "{}; {}/finding/{};{};{};{};{};{};{};{};{};{};{};{};no action both sides are inactive/closed;{}".format(
+                find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, None, None, None,
                 find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, "equal")
             messages.append(message)
             logger.info(message)
@@ -148,15 +148,11 @@ def jira_status_reconciliation(*args, **kwargs):
 
                 status_changed = jira_helper.process_resolution_from_jira(find, resolution_id, resolution_name, assignee_name, issue_from_jira.fields.updated, find.jira_issue) if not dryrun else "dryrun"
                 if status_changed:
-                    message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s finding in defectdojo;%s" % \
-                        (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, flag1, flag2, flag3,
-                        find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, message_action, status_changed)
+                    message = f"{find.jira_issue.jira_key}; {settings.SITE_URL}/finding/{find.id};{find.status()};{resolution_name};{flag1};{flag2};{flag3};{find.jira_issue.jira_change};{issue_from_jira.fields.updated};{find.last_status_update};{issue_from_jira.fields.updated};{find.last_reviewed};{issue_from_jira.fields.updated};{message_action} finding in defectdojo;{status_changed}"
                     messages.append(message)
                     logger.info(message)
                 else:
-                    message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;no changes made from jira resolution;%s" % \
-                        (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, flag1, flag2, flag3,
-                        find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, status_changed)
+                    message = f"{find.jira_issue.jira_key}; {settings.SITE_URL}/finding/{find.id};{find.status()};{resolution_name};{flag1};{flag2};{flag3};{find.jira_issue.jira_change};{issue_from_jira.fields.updated};{find.last_status_update};{issue_from_jira.fields.updated};{find.last_reviewed};{issue_from_jira.fields.updated};no changes made from jira resolution;{status_changed}"
                     messages.append(message)
                     logger.info(message)
 
@@ -171,24 +167,18 @@ def jira_status_reconciliation(*args, **kwargs):
                 status_changed = jira_helper.push_status_to_jira(find, jira_instance, jira, issue_from_jira, save=True) if not dryrun else "dryrun"
 
                 if status_changed:
-                    message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s jira issue;%s;" % \
-                        (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, flag1, flag2, flag3, message_action,
-                        find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, status_changed)
+                    message = f"{find.jira_issue.jira_key}; {settings.SITE_URL}/finding/{find.id};{find.status()};{resolution_name};{flag1};{flag2};{flag3};{message_action};{find.jira_issue.jira_change};{issue_from_jira.fields.updated};{find.last_status_update};{issue_from_jira.fields.updated};{find.last_reviewed};{issue_from_jira.fields.updated} jira issue;{status_changed};"
                     messages.append(message)
                     logger.info(message)
                 else:
                     if status_changed is None:
                         status_changed = "Error"
-                    message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;no changes made while pushing status to jira;%s" % \
-                        (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, flag1, flag2, flag3,
-                        find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, status_changed)
+                    message = f"{find.jira_issue.jira_key}; {settings.SITE_URL}/finding/{find.id};{find.status()};{resolution_name};{flag1};{flag2};{flag3};{find.jira_issue.jira_change};{issue_from_jira.fields.updated};{find.last_status_update};{issue_from_jira.fields.updated};{find.last_reviewed};{issue_from_jira.fields.updated};no changes made while pushing status to jira;{status_changed}"
                     messages.append(message)
 
                     logger.info(message)
             else:
-                message = "%s; %s/finding/%d;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;unable to determine source of truth;%s" % \
-                    (find.jira_issue.jira_key, settings.SITE_URL, find.id, find.status(), resolution_name, flag1, flag2, flag3,
-                    find.jira_issue.jira_change, issue_from_jira.fields.updated, find.last_status_update, issue_from_jira.fields.updated, find.last_reviewed, issue_from_jira.fields.updated, status_changed)
+                message = f"{find.jira_issue.jira_key}; {settings.SITE_URL}/finding/{find.id};{find.status()};{resolution_name};{flag1};{flag2};{flag3};{find.jira_issue.jira_change};{issue_from_jira.fields.updated};{find.last_status_update};{issue_from_jira.fields.updated};{find.last_reviewed};{issue_from_jira.fields.updated};unable to determine source of truth;{status_changed}"
                 messages.append(message)
 
                 logger.info(message)

dojo/models.py

@@ -1476,7 +1476,7 @@ class Meta:
         ]
 
     def __str__(self):
-        return "Engagement %i: %s (%s)" % (self.id if id else 0, self.name or "",
+        return "Engagement {}: {} ({})".format(self.id if id else 0, self.name or "",
                                         self.target_start.strftime(
                                             "%b %d, %Y"))
 
@@ -2244,7 +2244,7 @@ class Meta:
         ordering = ("test_import", "action", "finding")
 
     def __str__(self):
-        return "%i: %s" % (self.finding.id, self.action)
+        return f"{self.finding.id}: {self.action}"
 
 
 class Finding(models.Model):

dojo/risk_acceptance/helper.py

@@ -175,30 +175,30 @@ def expiration_handler(*args, **kwargs):
 
 
 def expiration_message_creator(risk_acceptance, heads_up_days=0):
-    return "Risk acceptance [(%s)|%s] with %i findings has expired" % \
-        (escape_for_jira(risk_acceptance.name),
+    return "Risk acceptance [({})|{}] with {} findings has expired".format(
+        escape_for_jira(risk_acceptance.name),
         get_full_url(reverse("view_risk_acceptance", args=(risk_acceptance.engagement.id, risk_acceptance.id))),
         len(risk_acceptance.accepted_findings.all()))
 
 
 def expiration_warning_message_creator(risk_acceptance, heads_up_days=0):
-    return "Risk acceptance [(%s)|%s] with %i findings will expire in %i days" % \
-        (escape_for_jira(risk_acceptance.name),
+    return "Risk acceptance [({})|{}] with {} findings will expire in {} days".format(
+        escape_for_jira(risk_acceptance.name),
         get_full_url(reverse("view_risk_acceptance", args=(risk_acceptance.engagement.id, risk_acceptance.id))),
         len(risk_acceptance.accepted_findings.all()), heads_up_days)
 
 
 def reinstation_message_creator(risk_acceptance, heads_up_days=0):
-    return "Risk acceptance [(%s)|%s] with %i findings has been reinstated (expires on %s)" % \
-        (escape_for_jira(risk_acceptance.name),
+    return "Risk acceptance [({})|{}] with {} findings has been reinstated (expires on {})".format(
+        escape_for_jira(risk_acceptance.name),
         get_full_url(reverse("view_risk_acceptance", args=(risk_acceptance.engagement.id, risk_acceptance.id))),
         len(risk_acceptance.accepted_findings.all()), timezone.localtime(risk_acceptance.expiration_date).strftime("%b %d, %Y"))
 
 
 def accepted_message_creator(risk_acceptance, heads_up_days=0):
     if risk_acceptance:
-        return "Finding has been added to risk acceptance [(%s)|%s] with %i findings (expires on %s)" % \
-            (escape_for_jira(risk_acceptance.name),
+        return "Finding has been added to risk acceptance [({})|{}] with {} findings (expires on {})".format(
+            escape_for_jira(risk_acceptance.name),
             get_full_url(reverse("view_risk_acceptance", args=(risk_acceptance.engagement.id, risk_acceptance.id))),
             len(risk_acceptance.accepted_findings.all()), timezone.localtime(risk_acceptance.expiration_date).strftime("%b %d, %Y"))
     else:

dojo/templatetags/display_tags.py

@@ -338,7 +338,7 @@ def datediff_time(date1, date2):
     date_str = ""
     diff = dateutil.relativedelta.relativedelta(date2, date1)
     attrs = ["years", "months", "days"]
-    human_date = ["%d %s" % (getattr(diff, attr), (getattr(diff, attr) > 1 and attr) or attr[:-1])
+    human_date = [f"{getattr(diff, attr)} {(getattr(diff, attr) > 1 and attr) or attr[:-1]}"
                                     for attr in attrs if getattr(diff, attr)]
     for date_part in human_date:
         date_str = date_str + date_part + " "

dojo/tools/gitleaks/parser.py

@@ -61,10 +61,10 @@ def get_finding_legacy(self, issue, test, dupes):
         description += "**Reason:** " + reason + "\n"
         description += "**Path:** " + file_path + "\n"
         if "lineNumber" in issue:
-            description += "**Line:** %i\n" % issue["lineNumber"]
+            description += f"**Line:** {issue['lineNumber']}\n"
             line = issue["lineNumber"]
         if "operation" in issue:
-            description += "**Operation:** " + issue["operation"] + "\n"
+            description += f"**Operation:** {issue['operation']}\n"
         if "leakURL" in issue:
             description += (
                 "**Leak URL:** ["

dojo/utils.py

@@ -1876,9 +1876,9 @@ def _notification_title_for_finding(finding, kind, sla_age):
             period = "day"
             if abs_sla_age > 1:
                 period = "days"
-            title += "SLA breached by %d %s! Overdue notice" % (abs_sla_age, period)
+            title += f"SLA breached by {abs_sla_age} {period}! Overdue notice"
         elif kind == "prebreach":
-            title += "SLA pre-breach warning - %d day(s) left" % (sla_age)
+            title += f"SLA pre-breach warning - {sla_age} day(s) left"
         elif kind == "breaching":
             title += "SLA is breaching today"
 

requirements-lint.txt

@@ -1 +1 @@
-ruff==0.5.7
+ruff==0.6.1

ruff.toml

@@ -80,7 +80,6 @@ select = [
    "RUF013",
    "RUF019",
    "RUF021",
-   "RUF025",
 ]
 ignore = ["E501", "E722"]