refactor: better log output

phases/injector.py

@@ -114,8 +114,10 @@ class Injector():
         exe_out = self.settings.get_inject_exe_out()
         carrier_invoke_style: CarrierInvokeStyle = self.settings.carrier_invoke_style
 
-        logger.info("-[ Injecting Carrier".format())
+        logger.info("-[ Injecting Carrier into injectable".format())
         logger.info("    Injectable: {} -> {}".format(exe_in, exe_out))
+        logger.info("    Implant IAT fixup if necessary: {}".format(self.settings.fix_missing_iat))
+
 
         # Patch IAT (if necessary and wanted)
         self.injectable_patch_iat()
@@ -197,7 +199,7 @@ 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")
         iatRequests = self.injectable.get_all_iat_requests()
         iatMissing = []
         
@@ -212,7 +214,7 @@ class Injector():
                     iatRequest.name))
                 iatMissing.append(iatRequest)
 
-        logger.info("    IAT entries missing: {}".format(len(iatMissing)))
+        logger.info("    IAT entries missing in injectable for carrier: {}".format(len(iatMissing)))
         for iatRequest in iatMissing:
             # Not available, check if we can patch it
             iat_name = self.superpe.get_replacement_iat_for("KERNEL32.dll", iatRequest.name)
@@ -272,7 +274,7 @@ class Injector():
             return
         
         # insert data
-        logger.info("    Inject Carrier data into injectable .rdata/.text")
+        logger.info("    Inject Carrier-data into injectable")
         for datareuse_fixup in reusedata_fixups:
             logger.debug("      Handling DataReuse Fixup: {} (.code: {})".format(
                 datareuse_fixup.string_ref, datareuse_fixup.in_code))

phases/templater.py

@@ -28,7 +28,7 @@ def create_c_from_template(settings: Settings, payload_len: int):
     src = "{}{}/".format(PATH_CARRIER, settings.carrier_name)
     dst = "{}{}/".format(PATH_WEB_PROJECT, settings.project_name)
 
-    logger.info("-[ Carrier create Template: {}".format(
+    logger.info("-[ Create Carrier: {}".format(
         settings.project_c_path))
     
     # check that source directory exists
@@ -43,14 +43,13 @@ def create_c_from_template(settings: Settings, payload_len: int):
 
     logger.info("    Carrier: {}".format(
         settings.carrier_name))
-    logger.info("    Carrier: Code into: {}".format(
+    logger.info("    Store payload in: {}".format(
         settings.payload_location.value))
-    logger.info("    Carrier: Decoder: {}".format(
+    logger.info("    Use Decoder: {}".format(
         settings.decoder_style))
-    logger.info("    Carrier: Invoker: {}".format(
+    logger.info("    Use Invoker: {}".format(
         settings.carrier_invoke_style.value))
-
-    logger.info("    Carrier AntiEmulation: {}".format(
+    logger.info("    Use AntiEmulation: {}".format(
         settings.plugin_antiemulation)
     )
     if settings.plugin_guardrail != "none":