Ruff: Add and fix PLW15 (#10706)

Author: kiblik

docker/install_chrome_dependencies.py

@@ -18,7 +18,7 @@ def find_packages(library_name):
 
 
 def run_command(cmd, cwd=None, env=None):
-    result = subprocess.run(cmd, cwd=cwd, env=env, capture_output=True, text=True)
+    result = subprocess.run(cmd, cwd=cwd, env=env, capture_output=True, text=True, check=False)
     return result.stdout
 
 
@@ -27,7 +27,7 @@ def ldd(file_path):
     # For simplicity, I'm assuming if we get an error, the code is non-zero.
     try:
         result = subprocess.run(
-            ["ldd", file_path], capture_output=True, text=True,
+            ["ldd", file_path], capture_output=True, text=True, check=False,
         )
         stdout = result.stdout
         code = result.returncode

dojo/management/commands/csv_findings_export.py

@@ -26,7 +26,7 @@ def handle(self, *args, **options):
         findings = Finding.objects.filter(verified=True,
                                           active=True).select_related(
             "test__engagement__product")
-        writer = csv.writer(open(file_path, "w"))
+        writer = csv.writer(open(file_path, "w", encoding="utf-8"))
 
         headers = [
             "product_name",

dojo/management/commands/import_surveys.py

@@ -29,7 +29,7 @@ def handle(self, *args, **options):
         # Find the current id in the surveys file
         path = os.path.dirname(os.path.abspath(__file__))
         path = path[:-19] + "fixtures/initial_surveys.json"
-        contents = open(path).readlines()
+        contents = open(path, encoding="utf-8").readlines()
         for line in contents:
             if '"polymorphic_ctype": ' in line:
                 matchedLine = line
@@ -38,7 +38,7 @@ def handle(self, *args, **options):
         old_id = "".join(c for c in matchedLine if c.isdigit())
         new_line = matchedLine.replace(old_id, str(ctype_id))
         # Replace the all lines in the file
-        with open(path, "w") as fout:
+        with open(path, "w", encoding="utf-8") as fout:
             for line in contents:
                 fout.write(line.replace(matchedLine, new_line))
         # Delete the temp question

dojo/tools/blackduck/importer.py

@@ -33,7 +33,7 @@ def _process_csvfile(self, report):
         No file information then.
         """
         security_issues = {}
-        with open(str(report)) as f:
+        with open(str(report), encoding="utf-8") as f:
             security_issues = self.__partition_by_key(f)
 
         project_ids = set(security_issues.keys())
@@ -55,10 +55,10 @@ def _process_zipfile(self, report):
                 # Backwards compatibility, newer versions of Blackduck have a source file rather
                 # than a "files" file.
                 if "source" in file_name or "files" in file_name:
-                    with io.TextIOWrapper(zip.open(full_file_name)) as f:
+                    with io.TextIOWrapper(zip.open(full_file_name), encoding="utf-8") as f:
                         files = self.__partition_by_key(f)
                 elif "security" in file_name:
-                    with io.TextIOWrapper(zip.open(full_file_name)) as f:
+                    with io.TextIOWrapper(zip.open(full_file_name), encoding="utf-8") as f:
                         security_issues = self.__partition_by_key(f)
 
         project_ids = set(files.keys()) & set(security_issues.keys())

dojo/tools/blackduck_binary_analysis/importer.py

@@ -27,7 +27,7 @@ def _process_csvfile(self, report, orig_report_name):
         If passed a CSV file, process.
         """
         vulnerabilities = {}
-        with open(str(report)) as f:
+        with open(str(report), encoding="utf-8") as f:
             vulnerabilities = self.__partition_by_key(f)
 
         sha1_hash_keys = set(vulnerabilities.keys())

dojo/tools/blackduck_component_risk/importer.py

@@ -52,15 +52,15 @@ def _process_zipfile(self, report: Path) -> (dict, dict, dict):
                     file_name = full_file_name.split("/")[-1]
                     # Look for the component and security CSVs.
                     if "component" in file_name:
-                        with io.TextIOWrapper(zip.open(full_file_name)) as f:
+                        with io.TextIOWrapper(zip.open(full_file_name), encoding="utf-8") as f:
                             components = self.__get_components(f)
                             c_file = True
                     elif "security" in file_name:
-                        with io.TextIOWrapper(zip.open(full_file_name)) as f:
+                        with io.TextIOWrapper(zip.open(full_file_name), encoding="utf-8") as f:
                             security_issues = self.__get_security_risks(f)
                             s_file = True
                     elif "source" in file_name:
-                        with io.TextIOWrapper(zip.open(full_file_name)) as f:
+                        with io.TextIOWrapper(zip.open(full_file_name), encoding="utf-8") as f:
                             source = self.__get_source(f)
                 # Raise exception to error-out if the zip is missing either of
                 # these files.

ruff.toml

@@ -65,6 +65,7 @@ select = [
    "PD",
    "PGH",
    "PLE",
+   "PLW15",
    "TRY003",
    "TRY004",
    "TRY2",

tests/Import_scanner_test.py

@@ -58,7 +58,7 @@ def test_check_test_file(self):
 
     def test_check_for_forms(self):
         forms_path = dir_path[:-5] + "dojo/forms.py"
-        file = open(forms_path, "r+")
+        file = open(forms_path, "r+", encoding="utf-8")
         forms = file.readlines()
         file.close()
 
@@ -96,7 +96,7 @@ def test_check_for_forms(self):
     @unittest.skip("Deprecated since Dynamic Parser infrastructure")
     def test_check_for_options(self):
         template_path = dir_path[:-5] + "dojo/templates/dojo/import_scan_results.html"
-        file = open(template_path, "r+")
+        file = open(template_path, "r+", encoding="utf-8")
         templates = file.readlines()
         file.close()
 

unittests/dojo_test_case.py

@@ -481,7 +481,7 @@ def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1,
                                 product_name=None, product_type_name=None, auto_create_context=None, expected_http_status_code=201, test_title=None,
                                 scan_date=None, service=None, forceActive=True, forceVerified=True):
 
-        with open(get_unit_tests_path() + "/" + filename) as testfile:
+        with open(get_unit_tests_path() + "/" + filename, encoding="utf-8") as testfile:
             payload = {
                     "minimum_severity": minimum_severity,
                     "active": active,
@@ -533,7 +533,7 @@ def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1,
     def reimport_scan_with_params(self, test_id, filename, scan_type="ZAP Scan", engagement=1, minimum_severity="Low", active=True, verified=False, push_to_jira=None,
                                   tags=None, close_old_findings=True, group_by=None, engagement_name=None, scan_date=None,
                                   product_name=None, product_type_name=None, auto_create_context=None, expected_http_status_code=201, test_title=None):
-        with open(get_unit_tests_path() + "/" + filename) as testfile:
+        with open(get_unit_tests_path() + "/" + filename, encoding="utf-8") as testfile:
             payload = {
                     "minimum_severity": minimum_severity,
                     "active": active,
@@ -582,7 +582,7 @@ def reimport_scan_with_params(self, test_id, filename, scan_type="ZAP Scan", eng
     def endpoint_meta_import_scan_with_params(self, filename, product=1, product_name=None,
                                               create_endpoints=True, create_tags=True, create_dojo_meta=True,
                                               expected_http_status_code=201):
-        with open(get_unit_tests_path() + "/" + filename) as testfile:
+        with open(get_unit_tests_path() + "/" + filename, encoding="utf-8") as testfile:
             payload = {
                 "create_endpoints": create_endpoints,
                 "create_tags": create_tags,

unittests/test_apiv2_scan_import_options.py

@@ -30,7 +30,7 @@ def setUp(self):
         test.save()
 
     def import_zap_scan(self, upload_empty_scan=False):
-        with open("tests/zap_sample.xml") as file:
+        with open("tests/zap_sample.xml", encoding="utf-8") as file:
             if upload_empty_scan:
                 file = SimpleUploadedFile("zap_sample.xml", self.EMPTY_ZAP_SCAN.encode("utf-8"))