Skip to content

Sync/upstream 2026 11 - #1532

Closed
securifera wants to merge 8 commits into
Pennyw0rth:mainfrom
securifera:sync/upstream-2026-11
Closed

securifera wants to merge 8 commits into
Pennyw0rth:mainfrom
securifera:sync/upstream-2026-11

Conversation

@securifera

Copy link
Copy Markdown

Description

Please include a summary of the change and which issue is fixed, or what the enhancement does.
List any dependencies that are required for this change.

AI Assistance

If you have used AI in any form, please state the tool you used (e.g. Claude Code, Cursor, Amp) along with the extent that the work was AI-assisted.

Note that if you have used AI, you:

  • MUST test the changes against a live system
  • MUST include a screenshot of such a test (e.g. with a before and after screenshot when submitting a bug fix)
  • MUST fill out this PR template by hand, see the project's AI policy: AI_POLICY.md

Type of change

Insert an "x" inside the brackets for relevant items

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Deprecation of feature or functionality
  • This change requires a documentation update
  • This requires a third party update (such as Impacket, Dploot, lsassy, etc)
  • This PR was created with the assistance of AI (list what type of assistance, tool(s)/model(s) in the description)

Setup guide for the review

Please provide guidance on what setup is needed to test the introduced changes, such as the target(s) you tested against or software versions.

In particular:

  • Bug Fix: Please provide a short description on how to trigger the bug, to make the bug reproducable for the reviewer.
  • Added Feature/Enhancement: Please specify what setup is needed in order to test the changes, such as:
    • Is additional software needed?
    • GPO changes required?
    • Specific registry settings that need to be changed?

Screenshots (if appropriate):

Screenshots are always nice to have and can give a visual representation of the change.
If appropriate, include before and after screenshot(s) to show which results are to be expected.

Checklist:

Insert an "x" inside the brackets for completed and relevant items (do not delete options)

  • I have ran Ruff against my changes (poetry: poetry run ruff check ., use --fix to automatically fix what it can)
  • I have added or updated the tests/e2e_commands.txt file if necessary (new modules or features are required to be added to the e2e tests)
  • If reliant on changes of third party dependencies, such as Impacket, dploot, lsassy, etc, I have linked the relevant PRs in those projects
  • I have linked relevant sources that describes the added technique (blog posts, documentation, etc)
  • I have performed a self-review of my own code (not an AI review)
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (PR here: https://github.com/Pennyw0rth/NetExec-Wiki)

securifera and others added 8 commits January 10, 2026 22:04
Signed-off-by: Securifera, Inc <securifera@gmail.com>
Add OS to host object and JSON output
Sync with upstream df95344 (568 commits since merge base fd9ebe9).

Conflicts in nxc/cli.py, nxc/protocols/wmi.py and nxc/protocols/wmi/database.py
were resolved by taking upstream's version of those files (and nxc/logger.py)
and re-applying only the fork's functional changes. The fork's earlier
whole-file reformatting of these files is intentionally dropped so future
syncs don't conflict on every upstream edit; the fork's delta against
upstream in these four files is now 43 lines instead of ~450.

Fork behavior preserved:
- -j/--json JSON-lines output (cli.py, logger.py). Logger output was compared
  with the previous main in normal and JSON mode and is identical.
- WMI host tracking: server_os in the logger extra, db.add_host() after
  enum_host_info, hosts.domain/os columns and UNIQUE(ip) so the upsert works.
- wmi add_host is now (ip, hostname, port=None, domain=None, os=None), which
  stays call-compatible with upstream's (ip, hostname, port).
- _emit_json renamed to emit_json (AGENTS.md: no underscore-prefixed names).

Fixes the `pipx install` failure "certipy-ad (unavailable)": the fork pinned
`certipy-ad @ git+https://github.com/Pennyw0rth/Certipy`, whose package is now
named certipy-nxc. Upstream replaced the pin with `certipy-nxc>=5.1.0.post1`;
that change, including poetry.lock/uv.lock, comes in with this merge.

Note: upstream now requires Python >=3.11.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant