Merge pull request #315 from Pennyw0rth/neff-e2e_tests

Pennyw0rth · May 25, 2024 · b855dac · b855dac
2 parents ad923f8 + 404bff5
commit b855dac
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 220 deletions.
diff --git a/nxc/modules/bh_owned.py b/nxc/modules/bh_owned.py
diff --git a/nxc/paths.py b/nxc/paths.py
@@ -3,9 +3,7 @@
 import nxc
 
 NXC_PATH = os.path.expanduser("~/.nxc")
-TMP_PATH = os.path.join("/tmp", "nxc_hosted")
-if os.name == "nt":
-    TMP_PATH = os.getenv("LOCALAPPDATA") + "\\Temp\\nxc_hosted"
+TMP_PATH = os.getenv("LOCALAPPDATA") + "\\Temp\\nxc_hosted" if os.name == "nt" else os.path.join("/tmp", "nxc_hosted")
 if hasattr(sys, "getandroidapilevel"):
     TMP_PATH = os.path.join("/data", "data", "com.termux", "files", "usr", "tmp", "nxc_hosted")
 

diff --git a/nxc/protocols/mssql.py b/nxc/protocols/mssql.py
@@ -318,9 +318,10 @@ def execute(self, payload=None, get_output=False):
             return False
         else:
             self.logger.success("Executed command via mssqlexec")   
-            output_lines = StringIO(output).readlines()
-            for line in output_lines:
-                self.logger.highlight(line.strip())
+            if output:
+                output_lines = StringIO(output).readlines()
+                for line in output_lines:
+                    self.logger.highlight(line.strip())
         return output
 
     @requires_admin

diff --git a/tests/data/test_passwords.txt b/tests/data/test_passwords.txt
@@ -1,4 +1,5 @@
 Passw0rd!
 None
 ftp
-guest
+guest
+iamthekingoftheworld
diff --git a/tests/data/test_users.txt b/tests/data/test_users.txt
@@ -1,4 +1,5 @@
 Administrator
 Anonymous
 ftp
-guest
+guest
+robert.baratheon