Don't require Username and Password for every RHost auth: allows Scha… #19551
+1
−1
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.
This fixes a datastore options bug for LDAP modules. With the new optional session functionality enabled, if using
RHOST
, the system forced the use of Username and Password. However several valid configurations exist that do not require these settings (e.g. Schannel, or cached Kerberos creds).This PR resolves the issue by only initially requiring RHOST runs to have the bare minimum settings (host and port), and then let each auth provider do its own checks (schannel for certfile, kerberos for... all of its various possible settings).
Verification
List the steps needed to make sure this thing works
msfconsole
features set ldap_session_type true
ldap_query
withldap::auth
set tokerberos
klist
use use auxiliary/gather/ldap_query
ldap::auth=schannel
and thecertfile
setldap::auth=kerberos
, with a username (so that it picks the correct cached cred), but no passwardTest runs
After fix: