Merge branch 'github_builder' of github.com:Pennyw0rth/NetExec into g…

…ithub_builder
Pennyw0rth · Sep 19, 2023 · 9b76759 · 9b76759
2 parents a825ef8 + 6978af1
commit 9b76759
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 45 deletions.
diff --git a/.github/workflows/netexec.yml b/.github/workflows/netexec.yml
@@ -8,13 +8,12 @@ jobs:
     name: NetExec Tests on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 4
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
     - uses: actions/checkout@v3
-    - name: NetExec tests on ${{ matrix.os }}
+    - name: NetExec set up python on ${{ matrix.os }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 data/nxc.db
+hash_spider_default.sqlite3
 *.bak
 *.log
 .venv

diff --git a/netexec.spec b/netexec.spec
@@ -13,32 +13,58 @@ a = Analysis(
         ('./nxc/modules', 'nxc/modules')
      ],
      hiddenimports=[
-         'nxc.protocols.mssql.mssqlexec',
-         'nxc.connection',
          'impacket.examples.secretsdump',
          'impacket.dcerpc.v5.lsat',
          'impacket.dcerpc.v5.transport',
          'impacket.dcerpc.v5.lsad',
+         'impacket.dcerpc.v5.gkdi',
+         'impacket.dcerpc.v5.rprn',
+         'impacket.dpapi_ng',
+         'impacket.tds',
+         'impacket.version',
+         'impacket.ldap.ldap',
+         'nxc.connection',
          'nxc.servers.smb',
          'nxc.protocols.smb.wmiexec',
          'nxc.protocols.smb.atexec',
          'nxc.protocols.smb.smbexec',
          'nxc.protocols.smb.mmcexec',
          'nxc.protocols.smb.smbspider',
          'nxc.protocols.smb.passpol',
+         'nxc.protocols.mssql.mssqlexec',
+         'nxc.helpers.bash',
+         'nxc.helpers.bloodhound',
+         'nxc.helpers.msada_guids',
          'paramiko',
          'pypsrp.client',
          'pywerview.cli.helpers',
-         'impacket.tds',
-         'impacket.version',
-         'nxc.helpers.bash',
          'pylnk3',
+         'pypykatz',
+         'masky',
+         'msldap',
+         'msldap.connection',
          'lsassy',
-         'win32timezone',
-         'impacket.tds',
-         'impacket.ldap.ldap',
-         'impacket.tds'
-         ],
+         'lsassy.dumper',
+         'lsassy.parser',
+         'lsassy.session',
+         'lsassy.impacketfile',
+         'dns',
+         'dns.name',
+         'dns.resolver',
+         'dploot',
+         'dploot.triage',
+         'dploot.triage.rdg',
+         'dploot.triage.vaults',
+         'dploot.triage.browser',
+         'dploot.triage.credentials',
+         'dploot.triage.masterkeys',
+         'dploot.triage.backupkey',
+         'dploot.triage.wifi',
+         'dploot.lib.target',
+         'dploot.lib.smb',
+         'pyasn1_modules.rfc5652',
+         'unicrypto.backends.pycryptodomex',
+     ],
      hookspath=['./nxc/.hooks'],
      runtime_hooks=[],
      excludes=[],

diff --git a/nxc/.hooks/hook-pypykatz.py b/nxc/.hooks/hook-pypykatz.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from PyInstaller.utils.hooks import collect_all
+
+datas, binaries, hiddenimports = collect_all("pypykatz")
diff --git a/nxc/modules/drop-sc.py b/nxc/modules/drop-sc.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import ntpath
+import tempfile
 
 
 class NXCModule:
@@ -45,7 +46,7 @@ def options(self, context, module_options):
 
         self.file_path = ntpath.join("\\", f"{self.filename}.searchConnector-ms")
         if not self.cleanup:
-            self.scfile_path = f"/tmp/{self.filename}.searchConnector-ms"
+            self.scfile_path = f"{tempfile.gettempdir()}/{self.filename}.searchConnector-ms"
             scfile = open(self.scfile_path, "w")
             scfile.truncate(0)
             scfile.write('<?xml version="1.0" encoding="UTF-8"?>')

diff --git a/nxc/modules/nanodump.py b/nxc/modules/nanodump.py
diff --git a/nxc/modules/procdump.py b/nxc/modules/procdump.py
@@ -8,9 +8,7 @@
 import base64
 import re
 import sys
-
-from pypykatz.pypykatz import pypykatz
-
+import pypykatz
 from nxc.helpers.bloodhound import add_user_bh
 
 

diff --git a/nxc/modules/webdav.py b/nxc/modules/webdav.py
@@ -46,6 +46,7 @@ def on_login(self, context, connection):
         except SessionError as e:
             if e.getErrorCode() == nt_errors.STATUS_OBJECT_NAME_NOT_FOUND:
                 pass
-
+            elif e.getErrorCode() in nt_errors.ERROR_MESSAGES:
+                context.log.fail(f"Error enumerating WebDAV: {e.getErrorString()[0]}", color="magenta")
             else:
                 raise e