Skip to content

Upstream merge 2#5

Merged
Mercury0 merged 231 commits intomainfrom
upstream-merge-2
Apr 8, 2026
Merged

Upstream merge 2#5
Mercury0 merged 231 commits intomainfrom
upstream-merge-2

Conversation

@Mercury0
Copy link
Copy Markdown
Collaborator

@Mercury0 Mercury0 commented Apr 8, 2026

Description

Resolve merge conflicts and sync with upstream.

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. See the project's AI policy for more details: https://github.com/Pennyw0rth/NetExec/blob/main/AI_POLICY.md

Type of change

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

  • 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 your locally running machine Python version & OS, as well as the target(s) you tested against, including 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)

LTJAXSON and others added 30 commits May 19, 2025 17:34
Signed-off-by: Wyndoo <wyndo101@gmail.com>
Signed-off-by: Wyndoo <wyndo101@gmail.com>
Add Active Directory Certificate Services (ADCS) enumeration to the
BloodHound collection workflow using CertiHound library.

Changes:
- Add 'adcs' to valid collection methods in resolve_collection_methods()
- Add CertiHound as optional dependency (pip install netexec[adcs])
- Implement _collect_adcs_for_bloodhound() for ADCS data collection
- Update bloodhound() to handle ADCS-only and combined collections
- Export ADCS data in BloodHound CE v6 format
Move CertiHound from optional to default dependencies and remove
conditional import handling since it will always be installed.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
add SMB module NTLM MIC bypass

Signed-off-by: polair <p0l4ir@gmail.com>
Signed-off-by: polair <p0l4ir@gmail.com>
Signed-off-by: polair <p0l4ir@gmail.com>
Signed-off-by: polair <p0l4ir@gmail.com>
Signed-off-by: polair <p0l4ir@gmail.com>
From terminaltables3 README:

> [terminaltables3] is a fork of the terminaltables project. Which is
> archived and unmaintained. This library is in a new namespace but should
> otherwise be a drop in replacement. Maintaining goals consist of
> maintaining ecosystem compatibility, type annotations and responding to
> community pull requests.

Debian has removed the old terminaltables projects and only provides
terminaltables3 now (in next release Debian 14 forky, which is currently
Debian testing). Other distros will probably do the same, or have done
it already.
@aconite33 aconite33 closed this Apr 8, 2026
@aconite33 aconite33 reopened this Apr 8, 2026
@aconite33 aconite33 closed this Apr 8, 2026
@aconite33 aconite33 reopened this Apr 8, 2026
@blacklanternsecurity blacklanternsecurity deleted a comment from github-actions bot Apr 8, 2026
@aconite33 aconite33 closed this Apr 8, 2026
@aconite33 aconite33 reopened this Apr 8, 2026
@Mercury0 Mercury0 merged commit 9a39a07 into main Apr 8, 2026
3 of 4 checks passed
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.