Repository navigation
Sync/upstream 2026 11 - #1532
Closed
securifera wants to merge 8 commits into
Closed
securifera wants to merge 8 commits into
securifera wants to merge 8 commits into
Conversation
Signed-off-by: Securifera, Inc <securifera@gmail.com>
Add OS to host object and JSON output
Sync/upstream 2026 08
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>
securifera
requested review from
Marshall-Hallenbeck,
NeffIsBack,
mpgn and
zblurx
as code owners
November 16, 2026 15:21
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
Type of change
Insert an "x" inside the brackets for relevant items
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:
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)
poetry run ruff check ., use--fixto automatically fix what it can)tests/e2e_commands.txtfile if necessary (new modules or features are required to be added to the e2e tests)