Skip to content

Commit 7e1537b

Browse files
authored
Merge branch 'main' into Add---remoteuac-module
2 parents f6436fd + c1e1205 commit 7e1537b

105 files changed

Lines changed: 5071 additions & 2281 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
---
2-
name: Pull request
3-
about: Update code to fix a bug or add an enhancement/feature
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
8-
---
91
## Description
102

113
Please include a summary of the change and which issue is fixed, or what the enhancement does.

.github/workflows/build-binaries.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ubuntu-latest, macOS-latest, windows-latest]
13-
python-version: ["3.11"]
13+
python-version: ["3.13"]
1414
#python-version: ["3.8", "3.9", "3.10", "3.11"] # for binary builds we only need one version
1515
steps:
1616
- uses: actions/checkout@v4
@@ -25,13 +25,13 @@ jobs:
2525
pyinstaller netexec.spec
2626
- name: Upload Windows Binary
2727
if: runner.os == 'windows'
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: nxc.exe
3131
path: dist/nxc.exe
3232
- name: Upload Nix/OSx Binary
3333
if: runner.os != 'windows'
34-
uses: actions/upload-artifact@v3
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: nxc-${{ matrix.os }}
3737
path: dist/nxc

.github/workflows/build-zipapps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ubuntu-latest, macOS-latest, windows-latest]
13-
python-version: ["3.8", "3.9", "3.10", "3.11"]
13+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: NetExec set up python on ${{ matrix.os }}
@@ -22,12 +22,12 @@ jobs:
2222
pip install shiv
2323
python build_collector.py
2424
- name: Upload nxc ZipApp
25-
uses: actions/upload-artifact@v3
25+
uses: actions/upload-artifact@v4
2626
with:
2727
name: nxc-zipapp-${{ matrix.os }}-${{ matrix.python-version }}
2828
path: bin/nxc
2929
- name: Upload nxcdb ZipApp
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: nxcdb-zipapp-${{ matrix.os }}-${{ matrix.python-version }}
3333
path: bin/nxcdb

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Python
2020
uses: actions/setup-python@v5
2121
with:
22-
python-version: 3.11
22+
python-version: 3.13
2323
cache: poetry
2424
cache-dependency-path: poetry.lock
2525
- name: Install dependencies with dev group

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ on:
88
jobs:
99
build:
1010
name: Test for Py${{ matrix.python-version }}
11-
if: github.event.review.state == 'APPROVED'
11+
if: github.event.review.state == 'APPROVED' || github.event_name == 'workflow_dispatch'
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
max-parallel: 5
1515
matrix:
1616
os: [ubuntu-latest]
17-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
17+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Install poetry
2121
run: |
22-
pipx install poetry
22+
pipx install poetry==1.8.4
2323
- name: NetExec set up python ${{ matrix.python-version }} on ${{ matrix.os }}
2424
uses: actions/setup-python@v5
2525
with:

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2023, Marshall-Hallenbeck, NeffIsBack, zblurx, mpgn_x64
1+
Copyright (c) 2025, Marshall-Hallenbeck, NeffIsBack, zblurx, mpgn_x64
22
Copyright (c) 2022, byt3bl33d3r
33
All rights reserved.
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Supported Python versions](https://img.shields.io/badge/python-3.8+-blue.svg)
1+
![Supported Python versions](https://img.shields.io/badge/python-3.10+-blue.svg)
22
[![Twitter](https://img.shields.io/twitter/follow/al3xn3ff?label=al3x_n3ff&style=social)](https://twitter.com/intent/follow?screen_name=al3x_n3ff)
33
[![Twitter](https://img.shields.io/twitter/follow/_zblurx?label=_zblurx&style=social)](https://twitter.com/intent/follow?screen_name=_zblurx)
44
[![Twitter](https://img.shields.io/twitter/follow/MJHallenbeck?label=MJHallenbeck&style=social)](https://twitter.com/intent/follow?screen_name=MJHallenbeck)

netexec.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ a = Analysis(
2525
'impacket.dcerpc.v5.lsad',
2626
'impacket.dcerpc.v5.gkdi',
2727
'impacket.dcerpc.v5.rprn',
28+
'impacket.dcerpc.v5.even',
2829
'impacket.dpapi_ng',
2930
'impacket.tds',
3031
'impacket.version',
3132
'impacket.ldap.ldap',
33+
'jwt',
3234
'nxc.connection',
3335
'nxc.servers.smb',
3436
'nxc.protocols.smb.wmiexec',
@@ -48,6 +50,7 @@ a = Analysis(
4850
'pywerview.cli.helpers',
4951
'pylnk3',
5052
'pypykatz',
53+
'pyNfsClient',
5154
'masky',
5255
'msldap',
5356
'msldap.connection',
@@ -69,6 +72,7 @@ a = Analysis(
6972
'dploot.triage.masterkeys',
7073
'dploot.triage.mobaxterm',
7174
'dploot.triage.backupkey',
75+
'dploot.triage.wam',
7276
'dploot.triage.wifi',
7377
'dploot.triage.sccm',
7478
'dploot.lib.target',

nxc/cli.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def gen_cli_args():
2222
except ValueError:
2323
VERSION = importlib.metadata.version("netexec")
2424
COMMIT = ""
25-
CODENAME = "ItsAlwaysDNS"
25+
CODENAME = "NeedForSpeed"
2626
nxc_logger.debug(f"NXC VERSION: {VERSION} - {CODENAME} - {COMMIT}")
2727

2828
generic_parser = argparse.ArgumentParser(add_help=False, formatter_class=DisplayDefaultsNotNone)
@@ -53,9 +53,9 @@ def gen_cli_args():
5353
|| || | \ | | ___ | |_ | ____| __ __ ___ ___
5454
\\( )// | \| | / _ \ | __| | _| \ \/ / / _ \ / __|
5555
.=[ ]=. | |\ | | __/ | |_ | |___ > < | __/ | (__
56-
/ /ॱ-ॱ\ \ |_| \_| \___| \__| |_____| /_/\_\ \___| \___|
57-
\ /
58-
56+
/ /˙-˙\ \ |_| \_| \___| \__| |_____| /_/\_\ \___| \___|
57+
˙ \ / ˙
58+
˙ ˙
5959
6060
The network execution tool
6161
Maintained as an open source project by @NeffIsBack, @MJHallenbeck, @_zblurx
@@ -98,6 +98,13 @@ def gen_cli_args():
9898
kerberos_group.add_argument("--use-kcache", action="store_true", help="Use Kerberos authentication from ccache file (KRB5CCNAME)")
9999
kerberos_group.add_argument("--aesKey", metavar="AESKEY", nargs="+", help="AES key to use for Kerberos Authentication (128 or 256 bits)")
100100
kerberos_group.add_argument("--kdcHost", metavar="KDCHOST", help="FQDN of the domain controller. If omitted it will use the domain part (FQDN) specified in the target parameter")
101+
102+
certificate_group = std_parser.add_argument_group("Certificate", "Options for certificate authentication")
103+
certificate_group.add_argument("--pfx-cert", metavar="PFXCERT", help="Use certificate authentication from pfx file .pfx")
104+
certificate_group.add_argument("--pfx-base64", metavar="PFXB64", help="Use certificate authentication from pfx file encoded in base64")
105+
certificate_group.add_argument("--pfx-pass", metavar="PFXPASS", help="Password of the pfx certificate")
106+
certificate_group.add_argument("--pem-cert", metavar="PEMCERT", help="Use certificate authentication from PEM file")
107+
certificate_group.add_argument("--pem-key", metavar="PEMKEY", help="Private key for the PEM format")
101108

102109
server_group = std_parser.add_argument_group("Servers", "Options for nxc servers")
103110
server_group.add_argument("--server", choices={"http", "https"}, default="https", help="use the selected server")

nxc/connection.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import random
2+
import sys
3+
import contextlib
4+
25
from os.path import isfile
36
from threading import BoundedSemaphore
47
from functools import wraps
@@ -13,10 +16,9 @@
1316
from nxc.logger import nxc_logger, NXCAdapter
1417
from nxc.context import Context
1518
from nxc.protocols.ldap.laps import laps_search
19+
from nxc.helpers.pfx import pfx_auth
1620

1721
from impacket.dcerpc.v5 import transport
18-
import sys
19-
import contextlib
2022

2123
sem = BoundedSemaphore(1)
2224
global_failed_logins = 0
@@ -229,7 +231,8 @@ def proto_flow(self):
229231
else:
230232
self.logger.debug("Created connection object")
231233
self.enum_host_info()
232-
if self.print_host_info() and (self.login() or (self.username == "" and self.password == "")):
234+
self.print_host_info()
235+
if self.login() or (self.username == "" and self.password == ""):
233236
if hasattr(self.args, "module") and self.args.module:
234237
self.load_modules()
235238
self.logger.debug("Calling modules")
@@ -383,7 +386,7 @@ def parse_credentials(self):
383386
if isfile(user):
384387
with open(user) as user_file:
385388
for line in user_file:
386-
if "\\" in line:
389+
if "\\" in line and len(line.split("\\")) == 2:
387390
domain_single, username_single = line.split("\\")
388391
else:
389392
domain_single = self.args.domain if hasattr(self.args, "domain") and self.args.domain else self.domain
@@ -547,6 +550,14 @@ def login(self):
547550
self.logger.info("Successfully authenticated using Kerberos cache")
548551
return True
549552

553+
if self.args.pfx_cert or self.args.pfx_base64 or self.args.pem_cert:
554+
self.logger.debug("Trying to authenticate using Certificate pfx")
555+
if not self.args.username:
556+
self.logger.fail("You must specify a username when using certificate authentication")
557+
return False
558+
with sem:
559+
return pfx_auth(self)
560+
550561
if hasattr(self.args, "laps") and self.args.laps:
551562
self.logger.debug("Trying to authenticate using LAPS")
552563
username[0], secret[0], domain[0] = laps_search(self, username, secret, cred_type, domain, self.dns_server)

0 commit comments

Comments
 (0)