Merge branch 'main' into ItsAlwaysDNS

Author: NeffIsBack

nxc/protocols/smb.py

@@ -1,7 +1,6 @@
 import ntpath
 import binascii
 import os
-from os.path import abspath
 import re
 from io import StringIO
 from Cryptodome.Hash import MD4
@@ -1281,7 +1280,7 @@ def put_file_single(self, src, dst):
 
     def put_file(self):
         for src, dest in self.args.put_file:
-            self.put_file_single(abspath(src), dest)
+            self.put_file_single(src, dest)
 
     def get_file_single(self, remote_path, download_path):
         share_name = self.args.share
@@ -1299,7 +1298,7 @@ def get_file_single(self, remote_path, download_path):
 
     def get_file(self):
         for src, dest in self.args.get_file:
-            self.get_file_single(src, abspath(dest))
+            self.get_file_single(src, dest)
 
 
     def enable_remoteops(self):

tests/e2e_commands.txt

@@ -28,9 +28,9 @@ netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -x ipconfig
 netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -x ipconfig --exec-method atexec
 netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -x ipconfig --exec-method smbexec
 netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -x ipconfig --exec-method mmcexec
-netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --put-file TEST_NORMAL_FILE C:\Windows\Temp\test_file.txt
-netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --put-file TEST_NORMAL_FILE C:\Windows\Temp\test_file.txt --put-file TEST_NORMAL_FILE C:\Windows\Temp\test_file2.txt
-netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --get-file C:\Windows\Temp\test_file.txt /tmp/test_file.txt 
+netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --put-file TEST_NORMAL_FILE \\Windows\\Temp\\test_file.txt
+netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --put-file TEST_NORMAL_FILE \\Windows\\Temp\\test_file.txt --put-file TEST_NORMAL_FILE \\Windows\\Temp\\test_file2.txt
+netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS --get-file \\Windows\\Temp\\test_file.txt /tmp/test_file.txt
 ##### SMB PowerShell
 netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -X ipconfig
 netexec smb TARGET_HOST -u LOGIN_USERNAME -p LOGIN_PASSWORD KERBEROS -X ipconfig --exec-method atexec

tests/e2e_tests.py

@@ -1,6 +1,6 @@
 import argparse
 from os import getcwd
-from os.path import dirname, abspath, join, realpath, isfile
+from os.path import dirname, abspath, join, realpath, isfile, normpath
 import subprocess
 from time import time
 from rich.console import Console
@@ -84,25 +84,25 @@ def get_cli_args():
     parser.add_argument(
         "--test-user-file",
         required=False,
-        default=abspath(join(script_dir, "data", "test_users.txt")),
+        default=normpath(join(script_dir, "data", "test_users.txt")),
         help="Path to the file containing test usernames",
     )
     parser.add_argument(
         "--test-password-file",
         required=False,
-        default=abspath(join(script_dir, "data", "test_passwords.txt")),
+        default=normpath(join(script_dir, "data", "test_passwords.txt")),
         help="Path to the file containing test passwords",
     )
     parser.add_argument(
         "--amsi-bypass-file",
         required=False,
-        default=abspath(join(script_dir, "data", "test_amsi_bypass.txt")),
+        default=normpath(join(script_dir, "data", "test_amsi_bypass.txt")),
         help="Path to the file containing AMSI bypasses",
     )
     parser.add_argument(
         "--test-normal-file",
         required=False,
-        default=abspath(join(script_dir, "data", "test_file.txt")),
+        default=normpath(join(script_dir, "data", "test_file.txt")),
         help="Path to file to upload/download"
     )
     parser.add_argument(