refactor: remove source_style enum, do it with directories

tester.py

@@ -22,17 +22,16 @@ def main():
 
 def test_exe_code():
     print("Testing: EXEs: Inject payload into .text")
-    settings = Settings()
+    settings = Settings("unittest")
     settings.payload_path = PATH_SHELLCODES + "createfile.bin"
     settings.verify = True
     settings.try_start_final_infected_exe = False
     settings.payload_location = PayloadLocation.CODE
-    settings.prep_web("unittest")
-    prepare_project("unittest", settings)
+    settings.prep_web()
     
     # 7z, peb-walk, change-entrypoint
     print("Test EXE 1/4: 7z, peb-walk, change-entrypoint")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "7z.exe"
     settings.inject_exe_out = PATH_EXES + "7z.verify.exe"
@@ -41,7 +40,7 @@ def test_exe_code():
 
     # 7z, peb-walk, hijack
     print("Test EXE 2/4: 7z, peb-walk, hijack main")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "7z.exe"
     settings.inject_exe_out = PATH_EXES + "7z.verify.exe"
@@ -50,7 +49,7 @@ def test_exe_code():
 
     # procexp, iat-reuse, change-entrypoint
     print("Test EXE 3/4: procexp, iat-reuse, change-entrypoint")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "procexp64.exe"
     settings.inject_exe_out = PATH_EXES + "procexp64.verify.exe"
@@ -59,7 +58,7 @@ def test_exe_code():
 
     # procexp, iat-reuse, backdoor
     print("Test EXE 4/4: procexp, iat-reuse, backdoor")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "procexp64.exe"
     settings.inject_exe_out = PATH_EXES + "procexp64.verify.exe"
@@ -69,17 +68,16 @@ def test_exe_code():
 
 def test_exe_data():
     print("Testing: EXEs: Inject into .data")
-    settings = Settings()
+    settings = Settings("unittest")
     settings.payload_path = PATH_SHELLCODES + "createfile.bin"
     settings.verify = True
     settings.try_start_final_infected_exe = False
     settings.payload_location = PayloadLocation.DATA
-    settings.prep_web("unittest")
-    prepare_project("unittest", settings)
+    settings.prep_web()
     
     # 7z, peb-walk, change-entrypoint
     print("Test EXE 1/4: 7z, peb-walk, change-entrypoint")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "7z.exe"
     settings.inject_exe_out = PATH_EXES + "7z.verify.exe"
@@ -88,7 +86,7 @@ def test_exe_data():
 
     # 7z, peb-walk, hijack
     print("Test EXE 2/4: 7z, peb-walk, hijack main")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "7z.exe"
     settings.inject_exe_out = PATH_EXES + "7z.verify.exe"
@@ -97,7 +95,7 @@ def test_exe_data():
 
     # procexp, iat-reuse, change-entrypoint
     print("Test EXE 3/4: procexp, iat-reuse, change-entrypoint")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "procexp64.exe"
     settings.inject_exe_out = PATH_EXES + "procexp64.verify.exe"
@@ -106,7 +104,7 @@ def test_exe_data():
 
     # procexp, iat-reuse, backdoor
     print("Test EXE 4/4: procexp, iat-reuse, backdoor")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "procexp64.exe"
     settings.inject_exe_out = PATH_EXES + "procexp64.verify.exe"
@@ -116,16 +114,15 @@ def test_exe_data():
 
 def test_dll_code():
     print("Testing: DLLs code")
-    settings = Settings()
+    settings = Settings("unittest")
     settings.payload_path = PATH_SHELLCODES + "createfile.bin"
     settings.verify = True
     settings.try_start_final_infected_exe = False
     settings.payload_location = PayloadLocation.CODE
-    settings.prep_web("unittest")
-    prepare_project("unittest", settings)
+    settings.prep_web()
     
     print("Test DLL 1/6: libbz2-1.dll, peb-walk, change-entrypoint dllMain (func=None)")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -133,7 +130,7 @@ def test_dll_code():
         print("Error")
 
     print("Test DLL 2/6: libbz2-1.dll, peb-walk, hijack dllMain (func=None)")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -142,7 +139,7 @@ def test_dll_code():
 
     print("Test DLL 3/6: libbz2-1.dll, peb-walk, change-entrypoint, func=BZ2_bzDecompress")
     settings.dllfunc = "BZ2_bzDecompress"
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -151,7 +148,7 @@ def test_dll_code():
 
     print("Test DLL 4/6: libbz2-1.dll, peb-walk, hijack main, func=BZ2_bzdopen")
     settings.dllfunc = "BZ2_bzdopen"
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -159,19 +156,17 @@ def test_dll_code():
         print("Error")
 
 
-
 def test_dll_data():
     print("Testing: DLLs data")
-    settings = Settings()
+    settings = Settings("unittest")
     settings.payload_path = PATH_SHELLCODES + "createfile.bin"
     settings.verify = True
     settings.try_start_final_infected_exe = False
     settings.payload_location = PayloadLocation.DATA
-    settings.prep_web("unittest")
-    prepare_project("unittest", settings)
+    settings.prep_web()
     
     print("Test DLL 1/6: libbz2-1.dll, peb-walk, change-entrypoint dllMain (func=None)")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -179,7 +174,7 @@ def test_dll_data():
         print("Error")
 
     print("Test DLL 2/6: libbz2-1.dll, peb-walk, hijack dllMain (func=None)")
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -188,7 +183,7 @@ def test_dll_data():
 
     print("Test DLL 3/6: libbz2-1.dll, peb-walk, change-entrypoint, func=BZ2_bzDecompress")
     settings.dllfunc = "BZ2_bzDecompress"
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -197,7 +192,7 @@ def test_dll_data():
 
     print("Test DLL 4/6: libbz2-1.dll, peb-walk, hijack main, func=BZ2_bzdopen")
     settings.dllfunc = "BZ2_bzdopen"
-    settings.source_style = FunctionInvokeStyle.peb_walk
+    settings.carrier_name = "peb_walk"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -208,7 +203,7 @@ def test_dll_data():
 def dll_iat_reuse():
     # procexp, iat-reuse, change-entrypoint
     print("Test: libbz2-1.dll, iat-reuse, change-entrypoint")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.ChangeEntryPoint
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -218,7 +213,7 @@ def dll_iat_reuse():
 
     # procexp, iat-reuse, backdoor
     print("Test: libbz2-1.dll, iat-reuse, backdoor")
-    settings.source_style = FunctionInvokeStyle.iat_reuse
+    settings.carrier_name = "iat_reuse"
     settings.carrier_invoke_style = CarrierInvokeStyle.BackdoorCallInstr
     settings.inject_exe_in = PATH_EXES + "libbz2-1.dll"
     settings.inject_exe_out = PATH_EXES + "libbz2-1.verify.dll"
@@ -229,5 +224,6 @@ def dll_iat_reuse():
 
 
 if __name__ == "__main__":
+    #setup_logging(level=logging.INFO)
     setup_logging(level=logging.WARNING)
     main()