Repository navigation

Upstream merge 2 - #5

Merged

Mercury0 merged 231 commits into

mainfrom

upstream-merge-2

Apr 8, 2026

Merged

Upstream merge 2#5
Mercury0 merged 231 commits into
mainfrom
upstream-merge-2

Commits on May 19, 2025
- Add mssql_dumper module for sensitive data discovery
  LTJAXSON
  committed
  3bb3550
Commits on Dec 16, 2025
- Updating e2e_commands.txt
  Wyndoo
  authored
  b2827ad
- Create get-scriptpath.py
  Wyndoo
  authored
  beedfe0
Commits on Dec 24, 2025
- Add mssql_cbt checker module
  Aurélien CHALOT
  committed
  44ddcdc
- Update e2e
  Aurélien CHALOT
  committed
  21c0af3
- Simplified logic
  Aurélien CHALOT
  committed
  5761da9
- Simplified again
  Aurélien CHALOT
  committed
  d9610f1
Commits on Dec 31, 2025
- feat(ldap): add ADCS collection support via CertiHound
  0x0Trace
  committed
  9f27582
Commits on Jan 8, 2026
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  8c8f430
Commits on Jan 24, 2026
- Fix incorrect exception handling
  GHWX8660
  committed
  6bd2de8
Commits on Jan 26, 2026
- feat(ldap): make CertiHound a required dependency
  
  0x0Trace
  and
  claude
  committed
  25f567a
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  12c1745
Commits on Jan 27, 2026
- Add files via upload
  pol4ir
  authored
  aed1cb3
- Update ntlm_mic_bypass.py
  pol4ir
  authored
  ec250af
- Update ntlm_mic_bypass.py
  pol4ir
  authored
  fa3ebc1
Commits on Jan 28, 2026
- Merge: NTLM reflection CVE handling
  pol4ir
  authored
  f340ab8
- Delete nxc/modules/ntlm_mic_bypass.py
  pol4ir
  authored
  8e7bc4e
Commits on Jan 31, 2026
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  2129198
Commits on Feb 4, 2026
- fix : support NTLM hash and AES key auth
  azoxlpf
  committed
  e3b97c6
Commits on Feb 5, 2026
- use kdcHost only for dc_ip
  azoxlpf
  committed
  bbcd292
Commits on Feb 6, 2026
- Remove function
  Aurélien CHALOT
  committed
  d4dd096
- refactor : switch from ldap3 to impacket CRUD and add LDAPS
  azoxlpf
  committed
  28343fe
Commits on Feb 7, 2026
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  54ab075
Commits on Feb 8, 2026
- fix AttributeError on NetBIOSTimeout in kerberos_login
  azoxlpf
  committed
  e1dfde2
- restore OSError logging with secret in kerberos_login
  azoxlpf
  committed
  a7ebd5c
Commits on Feb 9, 2026
- show auth credentials in kerberos_login connection error logs
  azoxlpf
  committed
  e1a6f15
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  a9efad3
Commits on Feb 10, 2026
- Switch to terminaltables3
  elboulangero
  committed
  933b971
Commits on Feb 11, 2026
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  bda56dd
Commits on Feb 13, 2026
- PR changes 13_02_26
  0x0Trace
  committed
  b20a7c1
Commits on Feb 16, 2026
- PR changes 16_02_26
  0x0Trace
  committed
  8424b49
- PR changes 16_02_26_comments_newline_fixes
  0x0Trace
  committed
  9af3e37
Commits on Feb 17, 2026
- SAM History Dumping
  Coontzy1
  committed
  d06d179
Commits on Feb 18, 2026
- Fix DPAPI credential lookup: add lowercase username for dploot compatibility
  
  mverschu
  and
  cursoragent
  committed
  f8b44d2
Commits on Feb 23, 2026
- Merge branch 'main' into feature/adcs-collection
  0x0Trace
  authored
  80d4818
Commits on Feb 27, 2026
- fix(backup_operator): add random suffix to dump filenames to avoid ERROR_ALREADY_EXISTS
  PatchRequest
  committed
  156eaf6
- Merge branch 'main' into fix/backup_operator_random_suffix
  NeffIsBack
  authored
  e065856
Commits on Mar 3, 2026
- fix(coerce_plus): move get_dynamic_endpoint back to module-level function
  
  Marshall-Hallenbeck
  and
  claude
  committed
  41b3fc2
- db: do not add credential if guest or null auth
  lap1nou
  committed
  82ff6b6
Commits on Mar 5, 2026
- Fix authentication from CCACHE when using kerberos S4U over SMB
  Eliotsehr
  committed
  77d2c1c
Commits on Mar 11, 2026
- Match entire string and add source for error msgs
  NeffIsBack
  committed
  e820d96
- Align hashes with lm:nt as required in the docstring
  NeffIsBack
  committed
  282fbe1
- Merge pull request #1081 from serwiz/fix/add-computer-exception-catch
  NeffIsBack
  authored
  bd1654b
- Improve clarity when login times out
  NeffIsBack
  committed
  bad31bc
- Merge pull request #1095 from azoxlpf/fix/certipy-auth-kerberos
  NeffIsBack
  authored
  0e4a049
- Merge pull request #1096 from azoxlpf/fix/netbios-exception-handling
  NeffIsBack
  authored
  bac2a95
- Use internal gen_random_string
  NeffIsBack
  committed
  1b9c93e
- Merge pull request #1124 from PatchRequest/fix/backup_operator_random_suffix
  NeffIsBack
  authored
  1d24435
- Formatting
  NeffIsBack
  committed
  2b5b92b
- Merge pull request #1133 from lap1nou/db-guest-null
  NeffIsBack
  authored
  9a2544b
- Get username from TGT/ST if not supplied
  NeffIsBack
  committed
  011416b
- Remove obsolete parsing for ccache inside ldap
  NeffIsBack
  committed
  d41ff46
- Merge pull request #1135 from Eliotsehr/fix_krb_S4U
  NeffIsBack
  authored
  e873e8f
- Remove duplicate line
  NeffIsBack
  committed
  3ac03b6
- Merge pull request #1113 from mverschu/fix/dpapi-username-case
  NeffIsBack
  authored
  e57ba1c
- Fix lock file
  NeffIsBack
  committed
  b312263
- Merge pull request #1102 from elboulangero/terminaltables3
  NeffIsBack
  authored
  26465b1
- Don't follow symlinks and especially don't reconnect because this doesn't help
  NeffIsBack
  committed
  78902ee
- Merge pull request #1140 from Pennyw0rth/neff-fix-spider_plus
  NeffIsBack
  authored
  0e90245
- Fix nfs for nfs4 only servers
  NeffIsBack
  committed
  543a5b3
- Merge pull request #1141 from Pennyw0rth/neff-fix-nfs4
  NeffIsBack
  authored
  c3b7e4a
- Merge branch 'main' into fix/moduleloader-namespace-collision
  Marshall-Hallenbeck
  authored
  1a59962
Commits on Mar 12, 2026
- Deprecate ntlm_reflection module
  NeffIsBack
  committed
  d161db2
- Initial enum_cve module
  NeffIsBack
  committed
  ac73551
- Update log output to use zone instead of domain
  gatariee
  authored
  3d7ae49
- Module description and formatting
  NeffIsBack
  committed
  77b1efe
- Formatting
  NeffIsBack
  committed
  65a7389
- Add CVE dict and logic for enumeration
  NeffIsBack
  committed
  3dbef63
- Improve messages
  NeffIsBack
  committed
  f61bf5a
- Simplify logic
  NeffIsBack
  committed
  9a7a302
- Fix CVE UBRs
  NeffIsBack
  committed
  1e90ead
- Prevent stacktrace when guest try access winreg
  NeffIsBack
  committed
  627aeff
- Add UBR to debug output
  NeffIsBack
  committed
  138f606
- Add exploitation source
  NeffIsBack
  committed
  ffd615e
- Add exploitation source
  NeffIsBack
  committed
  92e2b8f
- Remove deprecated open call
  NeffIsBack
  committed
  82b1336
- Remove unused imports
  NeffIsBack
  committed
  3c4e387
- Merge pull request #1142 from gatariee/get-network-patch
  NeffIsBack
  authored
  32796c6
- Don't display the index error when guest auth is active
  NeffIsBack
  committed
  087ee8b
- Merge pull request #1131 from Pennyw0rth/fix/moduleloader-namespace-collision
  Marshall-Hallenbeck
  authored
  90ef481
- Merge pull request #1145 from Pennyw0rth/neff-fix-shares-guest
  NeffIsBack
  authored
  b037969
- There are users with empty passwords
  NeffIsBack
  committed
  c015d2c
- Merge branch 'main' into main
  pol4ir
  authored
  2347874
- Merge pull request #1147 from Pennyw0rth/neff-fix-shares-empty-pw
  NeffIsBack
  authored
  0347c13
Commits on Mar 13, 2026
- Merge pull request #1086 from pol4ir/main
  NeffIsBack
  authored
  83dcd26
- Catch KDC_ERR_ETYPE_NOSUPP if there are no etypes left to request
  NeffIsBack
  committed
  44a24f0
- Use connection logger instead of universal logger
  NeffIsBack
  committed
  845f8d9
- Merge pull request #1149 from Pennyw0rth/neff-fix-asreproast
  NeffIsBack
  authored
  e7fa3fd
- add BadSuccessor and dc_only flag
  azoxlpf
  committed
  d5ff66b
- Merge branch 'main' into feat/add-badsuccessor-check
  azoxlpf
  authored
  defda58
- Add support for dploot 3.2.2 and google chrome +137 decryption
  zblurx
  committed
  25166e0
- update poetry lock
  zblurx
  committed
  f55a234
Commits on Mar 14, 2026
- Log as success and not full highlight
  NeffIsBack
  committed
  429764c
- If retreiving lsass pid failed this would lead to a crash when trying to split the string
  NeffIsBack
  committed
  8a1fa2f
- Wording
  NeffIsBack
  committed
  6bb2d66
- Prevent doing database stuff if we don't have a valid connection
  NeffIsBack
  committed
  f94b139
- Merge pull request #1154 from Pennyw0rth/neff-minor-fixes
  NeffIsBack
  authored
  2bd69e0
- Merge pull request #1151 from Pennyw0rth/dpapi_chrome_fix
  NeffIsBack
  authored
  75b207c
- Merge pull request #1155 from Pennyw0rth/neff-fix-relaying
  NeffIsBack
  authored
  faea737
- call is_host_dc() for dc_only CVEs and cache result
  azoxlpf
  committed
  65cc672
- Merge branch 'main' into feat/add-badsuccessor-check
  azoxlpf
  authored
  f42be28
Commits on Mar 16, 2026
- Merge pull request #1150 from azoxlpf/feat/add-badsuccessor-check
  NeffIsBack
  authored
  1f7cdb1
- Update enum_av.py
  0xaled
  authored
  a1cadc4
Commits on Mar 17, 2026
- Merge pull request #1156 from 0xaled/NetExec-Avast-AVG-Enum
  NeffIsBack
  authored
  1fb8433
- Add missing lm hash var
  NeffIsBack
  committed
  08e1b74
- Formatting
  NeffIsBack
  committed
  e4cb390
- Formatting
  NeffIsBack
  committed
  1f9f9e3
- Fix logging
  NeffIsBack
  committed
  d469fc6
- Switch to Pennyw0rth impacket fork for fake cbt value
  NeffIsBack
  committed
  b83e345
- Formatting
  NeffIsBack
  committed
  bc1efe1
- Merge branch 'main' into mssql-cbt
  NeffIsBack
  committed
  e00d08f
- Fix lock file
  NeffIsBack
  committed
  29b4012
- Merge branch 'main' into certihound
  NeffIsBack
  committed
  ce04940
- Merge branch 'main' into feat/add-ldaps-addccomputer
  azoxlpf
  authored
  b951b5c
- Move import
  NeffIsBack
  committed
  11bb8fb
- Move bh collection method logic out of ldap proto
  NeffIsBack
  committed
  7999b77
- Simplify resolving logic
  NeffIsBack
  committed
  a0573a6
- Simplify resolving logic
  NeffIsBack
  committed
  aecad76
- Formatting
  NeffIsBack
  committed
  fa26792
- Formatting
  NeffIsBack
  committed
  ab88315
- Formatting
  NeffIsBack
  committed
  f4967a6
- Simplify filtering
  NeffIsBack
  committed
  ea9b661
- Fix json formatting
  NeffIsBack
  committed
  37194c6
- fix conflicts
  azoxlpf
  committed
  39f3a28
- ruff fix
  azoxlpf
  committed
  475078d
Commits on Mar 18, 2026
- Fix options text
  NeffIsBack
  committed
  1fdd259
- Remove unnecessary checks
  NeffIsBack
  committed
  1517597
- Remove LDAPS statements
  NeffIsBack
  committed
  c169d28
- Formatting
  NeffIsBack
  committed
  9bff5bb
- Remove unnecessary checks
  NeffIsBack
  committed
  25b72e1
- Formatting
  NeffIsBack
  committed
  b7d0463
- Simplify code
  NeffIsBack
  committed
  06c0735
- Clarify variable name
  NeffIsBack
  committed
  7724e88
- Formatting
  NeffIsBack
  committed
  05cc920
- Fix exception handling as in #1081
  NeffIsBack
  committed
  6228c18
- Merge pull request #1098 from azoxlpf/feat/add-ldaps-addccomputer
  NeffIsBack
  authored
  170ce53
- fallback kdcHost to target IP when DNS resolution fails
  azoxlpf
  committed
  5a955dd
- handle kdcHost None gracefully, avoid self.host fallback for non-DC targets
  azoxlpf
  committed
  8e5a4fb
- Update enum_av.py With Elastic EDR Version 9.3.0 indicator
  0xaled
  authored
  a869a3f
- ruff fix
  azoxlpf
  committed
  82dcdd1
- Update enum_av.py : Reorder products alphabetically and add Elastic EDR indicators
  0xaled
  authored
  ca62afc
- fix spacing for improved code readability
  0xaled
  authored
  ce30d43
- Merge pull request #1162 from 0xaled/NetExec-Enum-AV
  NeffIsBack
  authored
  6d1df54
- Merge pull request #1160 from azoxlpf/fix/pfx-auth
  NeffIsBack
  authored
  756abe1
- Merge branch 'main' into add-mssql-dumper-module
  NeffIsBack
  authored
  36180b3
- Formatting
  NeffIsBack
  committed
  cbc40f7
- Sort pii values
  NeffIsBack
  committed
  c7b8e5b
- Formatting
  NeffIsBack
  committed
  d2640c9
Commits on Mar 19, 2026
- Fix module and options
  NeffIsBack
  committed
  46bfbcf
- Optimise code
  NeffIsBack
  committed
  848b7b0
- Optimise code
  NeffIsBack
  committed
  1b5cd4d
- Comments and removing unnecessary exception handler
  NeffIsBack
  committed
  5f2d347
- Replace exception handler with lastError check
  NeffIsBack
  committed
  a17137f
- Optimise code
  NeffIsBack
  committed
  dc3cd90
- Standardize json output
  NeffIsBack
  committed
  02f521e
- Save output file into nxc folder and remove unnecessary parsing
  NeffIsBack
  committed
  11fe13e
- Add SHOW_DATA options to regex check
  NeffIsBack
  committed
  62ae17d
- Update impacket
  NeffIsBack
  committed
  9f5ba4f
- Merge pull request #1164 from Pennyw0rth/neff-fix-dependencies
  NeffIsBack
  authored
  9d65d3c
- Add e2e tests
  NeffIsBack
  committed
  7c64f92
- Merge pull request #1054 from 0x0Trace/feature/adcs-collection
  NeffIsBack
  authored
  2204ea8
Commits on Mar 20, 2026
- Update dependencies
  NeffIsBack
  committed
  5d2b8fd
- Remove obsolete ruff setting
  NeffIsBack
  committed
  4c6ee6b
- Clean up ruff
  NeffIsBack
  committed
  6a443a5
- Replace os.path with async safe anyio.Path
  NeffIsBack
  committed
  76433ab
- Await forever
  NeffIsBack
  committed
  7b3aed0
- Merge pull request #1166 from Pennyw0rth/neff-update-dependencies
  NeffIsBack
  authored
  8dbf09c
Commits on Mar 21, 2026
- Patches the insert error
  Dfte
  authored
  59272d5
Commits on Mar 22, 2026
- Merge branch 'main' into mssql-cbt
  NeffIsBack
  committed
  e3b61df
- Fix lock file
  NeffIsBack
  committed
  8a9102d
- Update impacket
  NeffIsBack
  committed
  6ca1706
- Fix ruff
  NeffIsBack
  committed
  4795fbc
- Fix auth with hashes
  NeffIsBack
  committed
  ee20734
- Should be lm or nt hash
  NeffIsBack
  committed
  5e6bd51
- Merge pull request #1047 from Dfte/main
  NeffIsBack
  authored
  6de83de
- Merge branch 'main' into mssql-dumper
  NeffIsBack
  committed
  e8d8966
- Add like_search file input and disable preset option
  NeffIsBack
  committed
  1eb6c51
Commits on Mar 23, 2026
- Use connection.port variable on lsassy
  T1erno
  committed
  1f8d03e
- Update lsassy
  NeffIsBack
  committed
  31bdfe4
- Merge pull request #1171 from T1erno/Fix-lsassy-port
  NeffIsBack
  authored
  bac38ac
Commits on Mar 24, 2026
- fix: add thread-safety to failed login counters
  A3-N
  committed
  d7abaf2
Commits on Mar 25, 2026
- Merge branch 'main' into main
  NeffIsBack
  authored
  931f281
- Update enum_av.py: add HarfangLab Hurukai EDR indicators
  0xaled
  authored
  1ef7e79
- Update enum_av.py : Minor fix ( HarfangLab PR )
  0xaled
  authored
  ccbf41d
- Update enum_av.py : Minor fix ( HarfangLab PR )
  0xaled
  authored
  ee652ba
- Merge pull request #698 from LTJAXSON/add-mssql-dumper-module
  NeffIsBack
  authored
  409b027
- Just directly use arg and formatting
  NeffIsBack
  committed
  6cfb52c
- Merge pull request #1173 from 0xaled/NetExec-Enum-AV
  NeffIsBack
  authored
  43027f4
Commits on Mar 26, 2026
- Merge pull request #1110 from Coontzy1/main
  NeffIsBack
  authored
  d2342db
Commits on Mar 27, 2026
- removed outer check, no time save
  A3-N
  committed
  623e6aa
Commits on Mar 28, 2026
- Update search filter for computer accounts
  ledrypotato
  authored
  7fb80e6
Commits on Mar 29, 2026
- Merge pull request #1041 from Wyndoo/module-get-scriptpath
  NeffIsBack
  authored
  08ad1cc
Commits on Mar 30, 2026
Commits on Mar 31, 2026
Commits on Apr 1, 2026
- Merge branch 'main' into fix/mssql-integrated-auth-tds-error-handling
  azoxlpf
  authored
  b27b20f
- parse TDS ERROR/INFO via impacket
  azoxlpf
  committed
  7147aa2
- Merge branch 'main' into fix/mssql-attribute-error
  azoxlpf
  authored
  19f979c
- always return str from MSSQLEXEC.execute
  azoxlpf
  committed
  1b4900d
- Merge pull request #1182 from azoxlpf/fix/mssql-attribute-error
  NeffIsBack
  authored
  a073c2d
Commits on Apr 3, 2026
- Merge branch 'Pennyw0rth:main' into pre2k-module-adjustment
  ledrypotato
  authored
  12cb8e3
- add module option to query every computer object
  ledrypotato
  committed
  6e39d16
- fix module option description
  ledrypotato
  committed
  8ebf8fe
- Move error handling to login function, so if we crash we don't add users to db
  NeffIsBack
  committed
  c78bb6b
- Remove unnecessary None checks
  NeffIsBack
  committed
  ee37fc0
- Merge pull request #1180 from termanix/patch-2
  NeffIsBack
  authored
  3e4a7bc
- small adjustments + separate writing pre2k & non pre2k computers to different files
  ledrypotato
  committed
  c2efe58
- add e2e commands
  ledrypotato
  committed
  f2d2a72
- Only display accounts that have been found
  NeffIsBack
  committed
  ddc66c1
- Still display failed TGT retreival for pre2k accounts
  NeffIsBack
  committed
  ee466af
- Only apply ALL option if indeed set to true
  NeffIsBack
  committed
  121d6c4
- Merge pull request #1177 from ledrypotato/pre2k-module-adjustment
  NeffIsBack
  authored
  1f4acea
- rename ntlm_parser to negotiate_parser, add TDS LOGIN7 helpers
  azoxlpf
  committed
  6ada3ea
Commits on Apr 6, 2026
- Switch if logic
  NeffIsBack
  committed
  4cb4978
- Remove unused variable and add no_ntlm
  NeffIsBack
  committed
  804aeb0
- Remove print message
  NeffIsBack
  committed
  6c957f9
- Add NTLM:False flag
  NeffIsBack
  committed
  a1ecc1d
- Merge branch 'main' into fix/mssql-integrated-auth-tds-error-handling
  azoxlpf
  authored
  31472fb
- Merge pull request #1183 from azoxlpf/fix/mssql-integrated-auth-tds-error-handling
  NeffIsBack
  authored
  67d90e0
Commits on Apr 8, 2026
- Resolve merge conflicts and sync fork with upstream
  Mercury0
  committed
  6584260
- fix: ruff lint fixes
  Mercury0
  committed
  9a39a07

Commits

Commits on May 19, 2025

Commits on Dec 16, 2025

Commits on Dec 24, 2025

Commits on Dec 31, 2025

Commits on Jan 8, 2026

Commits on Jan 24, 2026

Commits on Jan 26, 2026

Commits on Jan 27, 2026

Commits on Jan 28, 2026

Commits on Jan 31, 2026

Commits on Feb 4, 2026

Commits on Feb 5, 2026

Commits on Feb 6, 2026

Commits on Feb 7, 2026

Commits on Feb 8, 2026

Commits on Feb 9, 2026

Commits on Feb 10, 2026

Commits on Feb 11, 2026

Commits on Feb 13, 2026

Commits on Feb 16, 2026

Commits on Feb 17, 2026

Commits on Feb 18, 2026

Commits on Feb 23, 2026

Commits on Feb 27, 2026

Commits on Mar 3, 2026

Commits on Mar 5, 2026

Commits on Mar 11, 2026

Commits on Mar 12, 2026

Commits on Mar 13, 2026

Commits on Mar 14, 2026

Commits on Mar 16, 2026

Commits on Mar 17, 2026