Merge branch 'main' into github_builder

.gitignore

@@ -1,4 +1,5 @@
 data/nxc.db
+hash_spider_default.sqlite3
 *.bak
 *.log
 .venv

netexec.spec

@@ -13,12 +13,17 @@ 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',
@@ -26,18 +31,39 @@ a = Analysis(
          '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',
+         'lsassy.dumper',
-         'impacket.tds',
+         'lsassy.parser',
-         'impacket.ldap.ldap',
+         'lsassy.session',
-         'impacket.tds'
+         '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=[],

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")

nxc/modules/drop-sc.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import ntpath
+import tempfile
 
 
 class NXCModule:
@@ -45,7 +46,7 @@ class NXCModule:
 
         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"?>')

nxc/modules/procdump.py

@@ -8,9 +8,7 @@
 import base64
 import re
 import sys
-
+import pypykatz
-from pypykatz.pypykatz import pypykatz
-
 from nxc.helpers.bloodhound import add_user_bh