Consolidate datastore with fallbacks logic #19869
Merged
Conversation
This file contains 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
adfoster-r7
force-pushed
the
consolidate-datastore-with-fallbacks-logic
branch
from
7d724b8 to
783742e
Compare
adfoster-r7
force-pushed
the
consolidate-datastore-with-fallbacks-logic
branch
from
783742e to
8e9c144
Compare
sjanusz-r7
reviewed
Feb 10, 2025
| @@ -24,7 +24,7 @@ class MetasploitModule < Msf::Auxiliary | |||
| def run_host(ip) | |||
| print_status("Running for #{ip}...") | |||
| rhost = datastore.delete('RHOST') | |||
| datastore.remove_option('RHOST') if self.datastore.is_a?(Msf::DataStoreWithFallbacks) | |||
There was a problem hiding this comment.
Are these necessary? Or would it be OK to remove these remove_option calls as the line below will overwrite potential RHOST values?
There was a problem hiding this comment.
Options are different to values; this was added for this bug fix where the datastore wasn't a Msf::DataStoreWithFallbacks instance: #17792
Let me know if I've misunderstood though
sjanusz-r7
approved these changes
Feb 10, 2025
adfoster-r7
added
rn-fix
Release NotesRemoves the |
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.
Consolidate datastore with fallbacks logic now that it has been enabled for multiple months it is safe to remove the previous implementation.
Verification