fix: revert output for command execution and normalize it to what SMB was

Author: Marshall-Hallenbeck

nxc/protocols/mssql.py

@@ -2,6 +2,7 @@
 import random
 import socket
 import contextlib
+from io import StringIO
 
 from nxc.config import process_secret
 from nxc.connection import connection
@@ -317,8 +318,9 @@ def execute(self, payload=None, get_output=False):
             return False
         else:
             self.logger.success("Executed command via mssqlexec")   
-            if get_output:
-                self.logger.highlight(output)
+            output_lines = StringIO(output).readlines()
+            for line in output_lines:
+                self.logger.highlight(line.strip())
         return output
 
     @requires_admin

nxc/protocols/smb.py

@@ -2,6 +2,7 @@
 import binascii
 import os
 import re
+from io import StringIO
 from Cryptodome.Hash import MD4
 
 from impacket.smbconnection import SMBConnection, SessionError
@@ -691,8 +692,9 @@ def execute(self, payload=None, get_output=False, methods=None):
 
             if (self.args.execute or self.args.ps_execute) and output:
                 self.logger.success(f"Executed command via {current_method}")
-                if output:
-                    self.logger.highlight(output)
+                output_lines = StringIO(output).readlines()
+                for line in output_lines:
+                    self.logger.highlight(line.strip())
             return output
         else:
             self.logger.fail(f"Execute command failed with {current_method}")