Merge branch 'main' into 281-multi-file-put

Author: Marshall-Hallenbeck

netexec.spec

@@ -42,6 +42,7 @@ a = Analysis(
         'nxc.helpers.bash',
         'nxc.helpers.bloodhound',
         'nxc.helpers.msada_guids',
+        'nxc.helpers.ntlm_parser',
         'paramiko',
         'pypsrp.client',
         'pywerview.cli.helpers',

nxc/logger.py

@@ -30,7 +30,7 @@ def setup_debug_logging():
         root_logger.setLevel(logging.INFO)
     elif debug_args.debug:
         nxc_logger.logger.setLevel(logging.DEBUG)
-        root_logger.setLevel(logging.DEBUG)
+        root_logger.setLevel(logging.INFO)
     else:
         nxc_logger.logger.setLevel(logging.ERROR)
         root_logger.setLevel(logging.ERROR)
@@ -53,13 +53,15 @@ def __init__(self, formatter=None, *args, **kwargs):
 
     def emit(self, record):
         """Overrides the emit method of the RichHandler class so we can set the proper pathname and lineno"""
+        # for some reason in RDP, the exc_text is None which leads to a KeyError in Python logging
+        record.exc_text = record.getMessage() if record.exc_text is None else record.exc_text
+        
         if hasattr(record, "caller_frame"):
             frame_info = inspect.getframeinfo(record.caller_frame)
             record.pathname = frame_info.filename
             record.lineno = frame_info.lineno
         super().emit(record)
 
-
 def no_debug(func):
     """Stops logging non-debug messages when we are in debug mode
     It creates a temporary logger and logs the message to the console and file

tests/e2e_tests.py

@@ -2,6 +2,7 @@
 import os
 import subprocess
 from rich.console import Console
+import platform
 
 
 def get_cli_args():
@@ -60,25 +61,59 @@ def get_cli_args():
         required=False,
         help="Protocols to test",
     )
-
+    parser.add_argument(
+        "--line-nums",
+        nargs="+",
+        type=parse_line_nums,
+        required=False,
+        help="Specify line numbers or ranges to run commands from",
+    )
+    parser.add_argument(
+        "--print-failures",
+        action="store_true",
+        required=False,
+        help="Prints all the commands of failed tests at the end"
+    )
     return parser.parse_args()
 
+def parse_line_nums(value):
+    line_nums = []
+    for item in value.split():
+        if "-" in item:
+            start, end = item.split("-")
+            line_nums.extend(range(int(start), int(end) + 1))
+        else:
+            line_nums.append(int(item))
+    return line_nums
 
 def generate_commands(args):
     lines = []
     file_loc = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))
     commands_file = os.path.join(file_loc, "e2e_commands.txt")
 
     with open(commands_file) as file:
-        for line in file:
-            if line.startswith("#"):
-                continue
-            line = line.strip()
-            if args.protocols:
-                if line.split()[1] in args.protocols:
+        if args.line_nums:
+            flattened_list = list({num for sublist in args.line_nums for num in sublist})
+            for i, line in enumerate(file):
+                if i + 1 in flattened_list:
+                    if line.startswith("#"):
+                        continue
+                    line = line.strip()
+                    if args.protocols:
+                        if line.split()[1] in args.protocols:
+                            lines.append(replace_command(args, line))
+                    else:
+                        lines.append(replace_command(args, line))
+        else:
+            for line in file:
+                if line.startswith("#"):
+                    continue
+                line = line.strip()
+                if args.protocols:
+                    if line.split()[1] in args.protocols:
+                        lines.append(replace_command(args, line))
+                else:
                     lines.append(replace_command(args, line))
-            else:
-                lines.append(replace_command(args, line))
     return lines
 
 def replace_command(args, line):
@@ -93,6 +128,7 @@ def replace_command(args, line):
 def run_e2e_tests(args):
     console = Console()
     tasks = generate_commands(args)
+    failures = []
 
     result = subprocess.Popen(
         "netexec --version",
@@ -107,10 +143,13 @@ def run_e2e_tests(args):
         failed = 0
 
         while tasks:
-            task = tasks.pop(0)
-            console.log(f"Running command: {task!s}")
+            task = str(tasks.pop(0))
+            # replace double quotes with single quotes for Linux due to special chars/escaping
+            if platform.system() == "Linux":
+                task = task.replace('"', "'")
+            console.log(f"Running command: {task}")
             result = subprocess.Popen(
-                str(task),
+                task,
                 shell=True,
                 stdin=subprocess.PIPE,
                 stdout=subprocess.PIPE,
@@ -125,6 +164,7 @@ def run_e2e_tests(args):
                 passed += 1
             else:
                 console.log(f"[bold red]{task.strip()} :cross_mark:[/]")
+                failures.append(task.strip())
                 failed += 1
 
             if args.errors:
@@ -136,6 +176,11 @@ def run_e2e_tests(args):
             if args.verbose:
                 # this prints sorta janky, but it does its job
                 console.log(f"[*] Results:\n{text.decode('utf-8')}")
+        
+        if args.print_failures and failures:
+            console.log("[bold red]Failed Commands:")
+            for failure in failures:
+                console.log(f"[bold red]{failure}")
         console.log(f"Tests [bold green] Passed: {passed} [bold red] Failed: {failed}")