Ruff: Add and fix RUF021 (#10715)

Author: kiblik

dojo/jira_link/helper.py

@@ -553,7 +553,7 @@ def get_labels(obj):
         if prod_name_label not in labels:
             labels.append(prod_name_label)
 
-    if system_settings.add_vulnerability_id_to_jira_label or jira_project and jira_project.add_vulnerability_id_to_jira_label:
+    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)

dojo/search/views.py

@@ -154,7 +154,7 @@ def simple_search(request):
             tags = operators["tags"] if "tags" in operators else keywords
             not_tag = operators["not-tag"] if "not-tag" in operators else keywords
             not_tags = operators["not-tags"] if "not-tags" in operators else keywords
-            if search_tags and tag or tags or not_tag or not_tags:
+            if (search_tags and tag) or tags or not_tag or not_tags:
                 logger.debug("searching tags")
 
                 Q1, Q2, Q3, Q4 = Q(), Q(), Q(), Q()

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 = ["%d %s" % (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/appcheck_web_application_scanner/engines/base.py

@@ -198,8 +198,8 @@ def parse_cpe(self, cpe_str: str) -> (Optional[str], Optional[str]):
             return None, None
         cpe_obj = CPE(cpe_str)
         return (
-            cpe_obj.get_product() and cpe_obj.get_product()[0] or None,
-            cpe_obj.get_version() and cpe_obj.get_version()[0] or None,
+            (cpe_obj.get_product() and cpe_obj.get_product()[0]) or None,
+            (cpe_obj.get_version() and cpe_obj.get_version()[0]) or None,
         )
 
     def parse_components(self, finding: Finding, value: [str]) -> None:

dojo/tools/detect_secrets/parser.py

@@ -53,8 +53,8 @@ def get_findings(self, filename, test):
                         date=find_date,
                         severity="High",
                         verified=is_verified,
-                        active="is_secret" in item
-                        and item["is_secret"] is True
+                        active=("is_secret" in item
+                        and item["is_secret"] is True)
                         or "is_secret" not in item,
                         file_path=file,
                         line=line,

dojo/tools/veracode_sca/parser.py

@@ -123,13 +123,13 @@ def _get_findings_json(self, file, test):
             )
             status = issue.get("issue_status")
             if (
-                issue.get("Ignored")
-                and issue.get("Ignored").capitalize() == "True"
-                or status
+                (issue.get("Ignored")
+                and issue.get("Ignored").capitalize() == "True")
+                or (status
                 and (
                     status.capitalize() == "Resolved"
                     or status.capitalize() == "Fixed"
-                )
+                ))
             ):
                 finding.is_mitigated = True
                 finding.mitigated = timezone.now()
@@ -212,10 +212,10 @@ def get_findings_csv(self, file, test):
                 finding.cvssv3_score = cvss_score
 
             if (
-                row.get("Ignored")
-                and row.get("Ignored").capitalize() == "True"
-                or row.get("Status")
-                and row.get("Status").capitalize() == "Resolved"
+                (row.get("Ignored")
+                and row.get("Ignored").capitalize() == "True")
+                or (row.get("Status")
+                and row.get("Status").capitalize() == "Resolved")
             ):
                 finding.is_mitigated = True
                 finding.mitigated = timezone.now()

ruff.toml

@@ -79,6 +79,7 @@ select = [
    "RUF001","RUF002", "RUF003", "RUF005",
    "RUF013",
    "RUF019",
+   "RUF021",
    "RUF025",
 ]
 ignore = ["E501", "E722"]

unittests/dojo_test_case.py

@@ -413,7 +413,7 @@ def assert_jira_issue_in_epic(self, finding, engagement, issue_in_epic=True):
         url = instance.url.strip("/") + "/rest/api/latest/issue/" + issue_id
         response = jira._session.get(url).json().get("fields", {})
         epic_link = response.get(epic_link_field, None)
-        if epic_id is None and epic_link is None or issue_in_epic:
+        if (epic_id is None and epic_link is None) or issue_in_epic:
             self.assertEqual(epic_id, epic_link)
         else:
             self.assertNotEqual(epic_id, epic_link)