Use os.path where possible

Author: JuanTecedor

cortexutils/analyzer.py

@@ -37,9 +37,9 @@ def get_param(self, name, default=None, message=None):
             and self.data_type == "file"
             and self.job_directory is not None
         ):
-            path = f"{self.job_directory}/input/{data}"
-            if os.path.isfile(path):
-                return path
+            input_path = os.path.join(self.job_directory, "input", data)
+            if os.path.isfile(input_path):
+                return input_path
         else:
             return data
 

cortexutils/worker.py

@@ -17,15 +17,15 @@ def __init__(self, job_directory, secret_phrases):
             if len(sys.argv) > 1:
                 job_directory = sys.argv[1]
             else:
-                job_directory = "/job"
+                job_directory = os.path.join(job_directory, "job")
         self.job_directory = job_directory
         if secret_phrases is None:
             self.secret_phrases = DEFAULT_SECRET_PHRASES
         else:
             self.secret_phrases = secret_phrases
         # Load input
         self._input = {}
-        input_path = f"{self.job_directory}/input/input.json"
+        input_path = os.path.join(self.job_directory, "input", "input.json")
         if os.path.isfile(input_path):
             with open(input_path) as f_input:
                 self._input = json.load(f_input)
@@ -118,9 +118,10 @@ def __write_output(self, data, ensure_ascii=False):
         if self.job_directory is None:
             json.dump(data, sys.stdout, ensure_ascii=ensure_ascii)
         else:
-            output_path = f"{self.job_directory}/output"
-            os.makedirs(output_path, exist_ok=True)
-            with open(f"{output_path}/output.json", mode="w") as f_output:
+            output_dir = os.path.join(self.job_directory, "output")
+            os.makedirs(output_dir, exist_ok=True)
+            output_path = os.path.join(output_dir, "output.json")
+            with open(output_path, mode="w") as f_output:
                 json.dump(data, f_output, ensure_ascii=ensure_ascii)
 
     def get_data(self):

tests/test_suite_analyzer.py

@@ -12,16 +12,18 @@
 
 
 def load_test_fixture(fixture_path):
-    path = os.path.dirname(os.path.abspath(__file__))
-    with open(path + "/" + fixture_path) as fixture_file:
+    tests_dir = os.path.dirname(os.path.abspath(__file__))
+    file_path = os.path.join(tests_dir, fixture_path)
+    with open(file_path) as fixture_file:
         input = fixture_file.read()
     sys.stdin = StringIO(input)
     sys.stdout = StringIO()
 
 
 class TestMinimalConfig(unittest.TestCase):
     def setUp(self):
-        load_test_fixture("fixtures/test-minimal-config.json")
+        fixture_path = os.path.join("fixtures", "test-minimal-config.json")
+        load_test_fixture(fixture_path)
         self.analyzer = Analyzer()
 
     def test_default_config(self):
@@ -43,7 +45,8 @@ def test_params_data(self):
 
 class TestProxyConfig(unittest.TestCase):
     def setUp(self):
-        load_test_fixture("fixtures/test-proxy-config.json")
+        fixture_path = os.path.join("fixtures", "test-proxy-config.json")
+        load_test_fixture(fixture_path)
         self.analyzer = Analyzer()
 
     def test_proxy_config(self):
@@ -58,7 +61,8 @@ def test_proxy_config(self):
 
 class TestTlpConfig(unittest.TestCase):
     def setUp(self):
-        load_test_fixture("fixtures/test-tlp-config.json")
+        fixture_path = os.path.join("fixtures", "test-tlp-config.json")
+        load_test_fixture(fixture_path)
         self.analyzer = Analyzer()
 
     def test_check_tlp_disabled(self):
@@ -89,7 +93,8 @@ def test_check_tlp_ok(self):
 
 class TestErrorResponse(unittest.TestCase):
     def setUp(self):
-        load_test_fixture("fixtures/test-error-response.json")
+        fixture_path = os.path.join("fixtures", "test-error-response.json")
+        load_test_fixture(fixture_path)
         self.analyzer = Analyzer()
 
     def test_error_response(self):
@@ -124,7 +129,8 @@ def test_error_response(self):
 
 class TestReportResponse(unittest.TestCase):
     def setUp(self):
-        load_test_fixture("fixtures/test-report-response.json")
+        fixture_path = os.path.join("fixtures", "test-report-response.json")
+        load_test_fixture(fixture_path)
         self.analyzer = Analyzer()
 
     def test_report_response(self):