Ruff: Add and fix ISC003 + merge ISC (#11706)

Author: kiblik

dojo/forms.py

@@ -328,8 +328,10 @@ def __init__(self, *args, **kwargs):
         # if this product has findings being asynchronously updated, disable the sla config field
         if self.instance.async_updating:
             self.fields["sla_configuration"].disabled = True
-            self.fields["sla_configuration"].widget.attrs["message"] = "Finding SLA expiration dates are currently being recalculated. " + \
-                                                                       "This field cannot be changed until the calculation is complete."
+            self.fields["sla_configuration"].widget.attrs["message"] = (
+                "Finding SLA expiration dates are currently being recalculated. "
+                "This field cannot be changed until the calculation is complete."
+            )
 
     class Meta:
         model = Product
@@ -954,8 +956,10 @@ class Meta:
 class EngForm(forms.ModelForm):
     name = forms.CharField(
         max_length=300, required=False,
-        help_text="Add a descriptive name to identify this engagement. "
-                  + "Without a name the target start date will be set.")
+        help_text=(
+            "Add a descriptive name to identify this engagement. "
+            "Without a name the target start date will be set."
+        ))
     description = forms.CharField(widget=forms.Textarea(attrs={}),
                                   required=False, help_text="Description of the engagement and details regarding the engagement.")
     product = forms.ModelChoiceField(label="Product",
@@ -2640,8 +2644,10 @@ def __init__(self, *args, **kwargs):
 
         # if this sla config has findings being asynchronously updated, disable the days by severity fields
         if self.instance.async_updating:
-            msg = "Finding SLA expiration dates are currently being recalculated. " + \
-                  "This field cannot be changed until the calculation is complete."
+            msg = (
+                "Finding SLA expiration dates are currently being recalculated. "
+                "This field cannot be changed until the calculation is complete."
+            )
             self.fields["critical"].disabled = True
             self.fields["enforce_critical"].disabled = True
             self.fields["critical"].widget.attrs["message"] = msg

dojo/management/commands/jira_refactor_data_migration.py

@@ -10,8 +10,10 @@
 
 class Command(BaseCommand):
 
-    help = "Command to move data from some tables to other tables as part of https://github.com/DefectDojo/django-DefectDojo/pull/3200" + \
+    help = (
+        "Command to move data from some tables to other tables as part of https://github.com/DefectDojo/django-DefectDojo/pull/3200"
         "Should normally be handled by the migration in that PR, but if that causes errors, this command can help to get the data migrated anyway."
+    )
 
     def move_jira_creation_changed(self):
         logger.info("migrating finding.jira_creation and jira_change fields to JIRA_Issue model")

dojo/tools/gitleaks/parser.py

@@ -128,7 +128,7 @@ def get_finding_current(self, issue, test, dupes):
             if len(message.split("\n")) > 1:
                 description += (
                     "**Commit message:**"
-                    + "\n```\n"
+                    "\n```\n"
                     + message.replace("```", "\\`\\`\\`")
                     + "\n```\n"
                 )

dojo/tools/sslscan/parser.py

@@ -41,8 +41,8 @@ def get_findings(self, file, test):
                     title = "heartbleed" + " | " + target.attrib["sslversion"]
                     description = (
                         "**heartbleed** :"
-                        + "\n\n"
-                        + "**sslversion** : "
+                        "\n\n"
+                        "**sslversion** : "
                         + target.attrib["sslversion"]
                         + "\n"
                     )

dojo/tools/sslyze/parser_xml.py

@@ -77,8 +77,8 @@ def get_findings(self, file, test):
                             title = element.attrib["title"] + " | " + host
                             description = (
                                 "**heartbleed** : Vulnerable"
-                                + "\n\n"
-                                + "**title** : "
+                                "\n\n"
+                                "**title** : "
                                 + element.attrib["title"]
                             )
                 if element.tag == "openssl_ccs":
@@ -91,8 +91,8 @@ def get_findings(self, file, test):
                             title = element.attrib["title"] + " | " + host
                             description = (
                                 "**openssl_ccs** : Vulnerable"
-                                + "\n\n"
-                                + "**title** : "
+                                "\n\n"
+                                "**title** : "
                                 + element.attrib["title"]
                             )
                 if element.tag == "reneg":
@@ -102,8 +102,8 @@ def get_findings(self, file, test):
                             title = element.attrib["title"] + " | " + host
                             description = (
                                 "**Session Renegotiation** : Vulnerable"
-                                + "\n\n"
-                                + "**title** : "
+                                "\n\n"
+                                "**title** : "
                                 + element.attrib["title"]
                             )
                 if (

dojo/tools/trufflehog3/parser.py

@@ -125,7 +125,7 @@ def get_finding_current(self, json_data, test, dupes):
             if len(commit_message.split("\n")) > 1:
                 description += (
                     "**Commit message:** "
-                    + "\n```\n"
+                    "\n```\n"
                     + commit_message.replace("```", "\\`\\`\\`")
                     + "\n```\n"
                 )

dojo/user/validators.py

@@ -77,8 +77,10 @@ def validate(self, password, user=None):
         return
 
     def get_help_text(self):
-        return gettext("The password must contain at least 1 special character, "
-            + """()[]{}|`~!@#$%^&*_-+=;:'",<>./?.""")
+        return gettext(
+            "The password must contain at least 1 special character, "
+            """()[]{}|`~!@#$%^&*_-+=;:'",<>./?.""",
+        )
 
 
 class DojoCommonPasswordValidator(CommonPasswordValidator):

dojo/utils.py

@@ -101,8 +101,10 @@ def do_false_positive_history(finding, *args, **kwargs):
 
     existing_fp_findings = existing_findings.filter(false_p=True)
     deduplicationLogger.debug(
-        "FALSE_POSITIVE_HISTORY: Found %i existing findings in the same product "
-        + "that were previously marked as false positive",
+        (
+            "FALSE_POSITIVE_HISTORY: Found %i existing findings in the same product "
+            "that were previously marked as false positive"
+        ),
         len(existing_fp_findings),
     )
 

ruff.toml

@@ -52,7 +52,7 @@ select = [
    "EM",
    "EXE",
    "FA",
-   "ISC001", "ISC002",
+   "ISC",
    "ICN",
    "LOG",
    "G001", "G002", "G01", "G1", "G2",

tests/close_old_findings_dedupe_test.py

@@ -80,8 +80,7 @@ def test_delete_findings(self):
         driver.find_element(By.CSS_SELECTOR, "i.fa-solid.fa-trash").click()
         try:
             WebDriverWait(driver, 1).until(EC.alert_is_present(),
-                                        "Timed out waiting for finding delete "
-                                        + "confirmation popup to appear.")
+                "Timed out waiting for finding delete confirmation popup to appear.")
             driver.switch_to.alert.accept()
         except TimeoutException:
             self.fail("Confirmation dialogue not shown, cannot delete previous findings")