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.
Note
This PR is required for another PR with Pro - https://github.com/rapid7/pro/pull/3808
This PR renames the LDAP datastore options to facilitate some changes being made in Pro as part of the following PR.
The reason this was required was due to adding the previous LDAP datastore values into the configuration hash within Pro in the following file -
ui/app/models/scan_task.rb
, this would result in duplicate hash keys as previous LDAP used:So I decided to align with how SMB was handling its datastore by updating them to be:
Verification
auxiliary/scanner/ldap/ldap_login
against an ldap server to get a session (an example of running an ldap container can be found in the ldap acceptance tests heremetasploit-framework/.github/workflows/ldap_acceptance.yml
Lines 67 to 71 in 33ffc14
SPEC_OPTS='--tag acceptance' SPEC_HELPER_LOAD_METASPLOIT=false bundle exec rspec ./spec/acceptance/ldap_spec.rb
and ensure those pass locally.msfconsole
ldap_login
module