Properly prepared everything

Author: jurgenwigg

tests/spytestdir/elastic.py

@@ -2,7 +2,6 @@
 # From a security point of view: Data exfiltration to an external provider with too many risks.
 
 import os
-
 from elasticsearch import Elasticsearch
 
 

tests/spytestdir/example1.py

@@ -1,5 +1,4 @@
 import os
-
 import requests
 
 password = os.environ["PASSWORD"]

tests/test_apicalls.py

@@ -1,10 +1,10 @@
+import pytest
 from pathlib import Path
 
-import pytest
+from codeaudit.api_interfaces import version, get_overview
 
-from codeaudit.api_interfaces import get_overview, version
-from codeaudit.checkmodules import get_imported_modules
 from codeaudit.filehelpfunctions import read_in_source_file
+from codeaudit.checkmodules import get_imported_modules
 
 
 def test_api_version():
@@ -51,7 +51,7 @@ def test_get_overview_validfile():
     # This is the expected dictionary - note for testing output!
     expected_data = {
         "FileName": "obfuscating.py",
-        "Number_Of_Lines": 54,
+        "Number_Of_Lines": 68,
         "AST_Nodes": 32,
         "Std-Modules": 2,
         "External-Modules": 0,

tests/test_basicpatterns.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.filehelpfunctions import read_in_source_file
 from codeaudit.issuevalidations import find_constructs
@@ -18,7 +17,7 @@ def test_basic_patterns():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.access": [8, 14], "eval": [11]}
+    expected_data = {"os.access": [9, 15], "eval": [12]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -36,7 +35,7 @@ def test_basic_patterns2():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.access": [8, 12], "eval": [10], "os": [8, 12]}
+    expected_data = {"os.access": [9, 13], "eval": [11], "os": [9, 13]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -53,7 +52,7 @@ def test_assert_keyword():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"assert": [5, 31]}
+    expected_data = {"assert": [4, 31]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data

tests/test_chmod.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.security_checks import perform_validations
 
@@ -21,7 +20,7 @@ def test_chmod_constructs():
     actual_data = result["result"]
 
     # This is the expected dictionary
-    expected_data = {"os.access": [5], "os.chmod": [8, 23, 25]}
+    expected_data = {"os.access": [6], "os.chmod": [9, 26, 28]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data

tests/test_constructspart2.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.filehelpfunctions import read_in_source_file
 from codeaudit.issuevalidations import find_constructs
@@ -40,7 +39,7 @@ def test_zipfile_extraction():
 
     # This is the expected dictionary
     expected_data = {
-        "zipfile.ZipFile": [8, 13, 17, 23],
+        "zipfile.ZipFile": [9, 14, 18, 25],
     }
 
     # Assert that the actual data matches the expected data
@@ -86,7 +85,7 @@ def test_input_statement():
     actual_data = result["result"]
 
     # This is the expected dictionary
-    expected_data = {"input": [6]}
+    expected_data = {"input": [7]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -104,7 +103,7 @@ def test_marshal_usage():
     actual_data = result["result"]
 
     # This is the expected dictionary
-    expected_data = {"marshal.loads": [30], "marshal.load": [36]}
+    expected_data = {"marshal.loads": [31], "marshal.load": [37]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -124,7 +123,7 @@ def test_tar_methods_use():
     actual_data = result["result"]
 
     # This is the expected dictionary
-    expected_data = {"tarfile.TarFile": [6, 10, 17, 22, 24]}
+    expected_data = {"tarfile.TarFile": [7, 12, 21, 27, 29]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data

tests/test_correctexceptionuse.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.filehelpfunctions import read_in_source_file
 from codeaudit.issuevalidations import find_constructs
@@ -18,7 +17,7 @@ def test_correct_exception_use():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"pass": [19], "continue": [11]}
+    expected_data = {"pass": [20], "continue": [12]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data

tests/test_directorycreation.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.filehelpfunctions import read_in_source_file
 from codeaudit.issuevalidations import find_constructs
@@ -18,7 +17,7 @@ def test_os_makedirs():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.makedirs": [10, 79]}
+    expected_data = {"os.makedirs": [10, 77]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -36,7 +35,7 @@ def test_os_mkdir():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mkdir": [23]}
+    expected_data = {"os.mkdir": [22]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -54,7 +53,7 @@ def test_os_mkfifo():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mkfifo": [45]}
+    expected_data = {"os.mkfifo": [44]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -72,7 +71,7 @@ def test_os_mknod():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mknod": [62]}
+    expected_data = {"os.mknod": [61]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data

tests/test_directorycreation2.py

@@ -1,6 +1,5 @@
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.filehelpfunctions import read_in_source_file
 from codeaudit.issuevalidations import find_constructs
@@ -36,7 +35,7 @@ def test_os_mkdir():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mkdir": [26]}
+    expected_data = {"os.mkdir": [25]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -54,7 +53,7 @@ def test_os_mkfifo():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mkfifo": [48]}
+    expected_data = {"os.mkfifo": [47]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -72,7 +71,7 @@ def test_os_mknod():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.mknod": [65]}
+    expected_data = {"os.mknod": [64]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -90,7 +89,7 @@ def test_os_makedirs():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.makedirs": [13, 82]}
+    expected_data = {"os.makedirs": [13, 80]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -108,7 +107,7 @@ def test_os_makedev():
     actual_data = find_constructs(source, constructs)
 
     # This is the expected dictionary
-    expected_data = {"os.makedev": [94]}
+    expected_data = {"os.makedev": [92]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data
@@ -125,9 +124,9 @@ def test_sys_calls():
 
     # This is the expected dictionary
     expected_data = {
-        "sys.call_tracing": [12],
-        "sys.setprofile": [29, 31],
-        "sys.settrace": [35, 37],
+        "sys.call_tracing": [15],
+        "sys.setprofile": [34, 36],
+        "sys.settrace": [41, 43],
     }
 
     # Assert that the actual data matches the expected data

tests/test_edgecases.py

@@ -11,9 +11,8 @@
 Validation file to see if SAST suppression works correct.
 """
 
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 
 from codeaudit.security_checks import perform_validations
 
@@ -39,8 +38,8 @@ def test_eval():
     # This is the expected dictionary
     expected_data = {
         "exec": [5],
-        "eval": [8, 11, 12, 13, 21, 23, 26, 28, 30],
-        "__import__": [30],
+        "eval": [8, 11, 12, 13, 22, 25, 28, 30, 32],
+        "__import__": [32],
     }
 
     # Assert that the actual data matches the expected data
@@ -79,7 +78,7 @@ def test_eval2():
     actual_data = result["result"]
 
     # This is the expected dictionary
-    expected_data = {"eval": [8]}
+    expected_data = {"eval": [10]}
 
     # Assert that the actual data matches the expected data
     assert actual_data == expected_data