feat: enforce lockout-safe password spraying and expand multi-domain credential access#238
Merged
Conversation
…red team guidance **Added:** - Collect interrupted tasks for re-dispatch via the normal LLM submission flow during orchestrator recovery instead of pushing to dead Redis queues - Store the Redis URL in TaskQueueCore to allow creation of dedicated connections for blocking commands (BRPOP), and add a method to open a dedicated connection for each BRPOP call - Define a RecoveryTask struct to track tasks needing re-dispatch after recovery **Changed:** - Orchestrator now re-dispatches recovered tasks using dispatcher.do_submit, with improved logging for successful, deferred, and failed re-dispatches - Recovery manager collects tasks to be re-dispatched through LLM submission and prepares payloads accordingly, updating recovery logs and results - RedisToolDispatcher uses a dedicated Redis connection for BRPOP per tool result wait, preventing agent loop serialization and falling back to the shared connection on error - Host domain extraction logic now requires at least three dot-separated hostname parts to avoid extracting meaningless domains from two-part hostnames (fixes domain detection bug) - Password spraying guidance in credential_access/no_cred.rs and red team templates expanded to emphasize deriving 3-5 contextual passwords from environment themes (domain, hostname, usernames) and using seasonal/year patterns - Red team agent and orchestrator templates updated to prioritize ldap_search_descriptions (description field password discovery), multi-domain coverage for asrep_roast/kerberoast/ldap_search_descriptions, and detailed instructions for credential expansion and ACL abuse chains - Recon agent template emphasizes checking user description fields for passwords on all domains **Removed:** - Direct requeue_task calls during recovery in favor of the new re-dispatch approach, with requeue_task retained but unused for potential future use
…ial guidance **Added:** - Implement lockout-aware precondition checks in password_spray; requires lockout_threshold from password_policy or explicit override with acknowledge_no_policy in ares-tools/src/credential_access/misc.rs - Add safety buffer to stay one attempt below lockout threshold and refuse to spray when budget is exhausted - Provide detailed refusal messages for unsafe spray attempts - Unit and async tests for password_spray lockout logic, refusal conditions, and overrides in misc.rs **Changed:** - Update password_spray tool description and schema in netexec_tools.rs to clarify lockout policy requirements and new arguments - Revise redteam LLM prompts and instructions to require password_policy before spraying, detail lockout_threshold/attempts_used_per_account handling, and remove context password derivation steps - Adjust documentation and comments throughout code and templates to reflect new lockout enforcement and example values (e.g., update sample domains, clarify host/domain examples) - Default spray jitter to 1s if not specified, ensuring safer spreading of authentication attempts **Removed:** - Remove LLM prompt/task instructions about deriving contextual/thematic passwords for spraying, focusing guidance on standard and seasonal patterns with strict lockout handling - Omit outdated comments and example user references in automation logic for improved clarity
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #238 +/- ##
==========================================
+ Coverage 74.89% 74.94% +0.04%
==========================================
Files 383 382 -1
Lines 80225 80418 +193
==========================================
+ Hits 60086 60267 +181
- Misses 20139 20151 +12 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
**Changed:** - Reformatted long lines to improve readability and maintain consistent style in the password_spray function and related test in misc.rs
… cases **Added:** - Added test to ensure RecoveryTask carries correct payload and fields for redispatch in `types.rs` - Added tests for domain controller registration edge cases: - Two-part hostnames use fallback domain instead of registering TLD - Two-part hostnames with no fallback domain skip registration entirely - Three-part hostnames extract the correct full domain in registration
**Changed:** - Removed outdated comments referencing prior requeue behavior in recovery manager and orchestrator modules to improve clarity - Clarified comments in domain extraction logic and Redis BRPOP connection handling for accuracy and brevity **Removed:** - Deleted the unused `requeue.rs` module and its reference in recovery/mod.rs as the requeue approach is no longer used - Removed inline comments describing the old requeue flow from related modules and tests
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
1 participant
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:
password_spraytool inares-toolspassword_spray:lockout_threshold,attempts_used_per_account, andacknowledge_no_policypassword_spraydedicated_connectionmethod toTaskQueuefor opening dedicated Redis connections for blocking operationsChanged:
password_spraytool now refuses to run unless lockout threshold is provided or override is explicitly set, preventing accidental account lockoutspassword_policycall before spraying and enforce passing thresholdsattempts_used_per_accountbetween spraysBRPOPcalls, resolving agent serialization bugRemoved:
requeue_taskduring task recovery in favor of re-dispatch through LLM submission