Skip to content

Merge upstream#4

Closed
Mercury0 wants to merge 231 commits intomainfrom
merge-upstream
Closed

Merge upstream#4
Mercury0 wants to merge 231 commits intomainfrom
merge-upstream

Conversation

@Mercury0
Copy link
Copy Markdown
Collaborator

@Mercury0 Mercury0 commented Apr 8, 2026

Resolve conflicts and merge with upstream.

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.
azoxlpf and others added 24 commits April 1, 2026 15:37
…rror

fix: avoid AttributeError when MSSQL command output is None
Improve error handling in change-password module
…auth-tds-error-handling

fix(mssql): handle TDS error when NTLM challenge absent and fix local-auth flow
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 8, 2026

It looks like the PR template may not have been filled out. The following sections appear to be missing:

  • Description

  • Type of change

  • Setup guide for the review

  • Checklist

Please edit your PR description to include them. The template helps reviewers understand and test your changes. Thanks!

@Mercury0
Copy link
Copy Markdown
Collaborator Author

Mercury0 commented Apr 8, 2026

I have read the CLA Document and I hereby sign the CLA

@Mercury0
Copy link
Copy Markdown
Collaborator Author

Mercury0 commented Apr 8, 2026

recheck

@Mercury0 Mercury0 closed this Apr 8, 2026
@Mercury0 Mercury0 deleted the merge-upstream branch April 8, 2026 20:35
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.