fix: ensure ADCS ESC1/ESC3 exploitation is reliably marked and improve SMB relay port handling#286
Merged
Conversation
…able timeout **Added:** - Added `bind_check` option to `RunOptions` to control wait time for port 445 to become free before spawning ntlmrelayx - Implemented `wait_for_port_free` async function to poll port availability with detailed error reporting - Introduced tests for `wait_for_port_free` covering both free and held port scenarios **Changed:** - Updated relay startup logic to use the new port availability check, providing actionable error output if port 445 remains occupied - Modified test setup to disable port check by default for faster, unaffected test runs
…ESC3 chains **Added:** - Explicitly call `mark_exploited` in deterministic ESC1 and ESC3 chains to credit exploited tokens when standard result processing is bypassed - Add warning logs for failures when marking ESC1 or ESC3 as exploited after chain success
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feat/more-attack-cov #286 +/- ##
=======================================================
Coverage ? 76.29%
=======================================================
Files ? 433
Lines ? 113877
Branches ? 0
=======================================================
Hits ? 86877
Misses ? 27000
Partials ? 0
🚀 New features to boost your workflow:
|
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.
Key Changes:
Added:
mark_exploitedin deterministic ADCS ESC1 and ESC3 chains to ensure scoreboard updates even when the standard exploit token is not emittedbind_checkfield toRunOptionsin coercion logic, allowing configurable wait for port 445 to become free before spawning relaywait_for_port_freeasync function to poll for port availability with clear error reporting if occupiedwait_for_port_freereturns Ok when port is free and Err when port is heldChanged:
wait_for_port_freebefore launching ntlmrelayx, surfacing clear diagnostics if port 445 is busy after cleanup