refactor: read shellcode (carrier, payload) directly, no more files

phases/assembler.py

@@ -9,9 +9,9 @@ from helper import *
 logger = logging.getLogger("Assembler")
 
 
-def asm_to_shellcode(asm_in: FilePath, build_exe: FilePath, shellcode_out: FilePath):
+def asm_to_shellcode(asm_in: FilePath, build_exe: FilePath) -> bytes:
     """Takes ASM source file asm_in, compiles it into build_exe, extracts its code section and write into shellcode_out"""
-    logger.info("--[ Assemble to exe: {} -> {} -> {}".format(asm_in, build_exe, shellcode_out))
+    logger.info("--[ Assemble to exe: {} -> {}".format(asm_in, build_exe))
     run_process_checkret([
         config.get("path_ml64"),
         asm_in,
@@ -22,24 +22,14 @@ def asm_to_shellcode(asm_in: FilePath, build_exe: FilePath, shellcode_out: FileP
     if not os.path.isfile(build_exe):
         raise Exception("Compiling failed")
     code = extract_code_from_exe_file(build_exe)
-    observer.add_code_file("carrier_shc", code) 
-    with open(shellcode_out, 'wb') as f:
-        f.write(code)
+    return code
 
 
 def merge_loader_payload(
-        shellcode_in: FilePath, 
-        shellcode_out: FilePath, 
+        shellcode_in: bytes, 
         payload_data: bytes, 
         decoder_style: DecoderStyle
-):
-    logger.info("--[ Merge stager with payload -> {}".format(
-        shellcode_out))
-    observer.add_code_file("payload_shc", payload_data)
-    
-    with open(shellcode_in, 'rb') as input1:
-        data_stager = input1.read()
-
+) -> bytes:
     if decoder_style == DecoderStyle.PLAIN_1:
         # Nothing to do
         pass
@@ -48,12 +38,7 @@ def merge_loader_payload(
         logger.info("---[ XOR payload with key 0x{:X}".format(xor_key))
         payload_data = bytes([byte ^ xor_key for byte in payload_data])
 
-    logger.info("---[ Size: Stager: {} and Payload: {}  Sum: {} ".format(
-        len(data_stager), len(payload_data), len(data_stager)+len(payload_data)))
+    logger.info("---[ Size: Carrier: {} and Payload: {}  Sum: {} ".format(
+        len(shellcode_in), len(payload_data), len(shellcode_in)+len(payload_data)))
 
-    with open(shellcode_out, 'wb') as output:
-        # append them
-        data = data_stager + payload_data
-        output.write(data)
-        observer.add_code_file("loader_shc", data) 
-        
+    return shellcode_in + payload_data