Merge pull request #19869 from adfoster-r7/consolidate-datastore-with…

…-fallbacks-logic Consolidate datastore with fallbacks logic
rapid7 · Feb 10, 2025 · 9396e1c · 9396e1c
2 parents d96d980 + 8e9c144
commit 9396e1c
Show file tree

Hide file tree

Showing 27 changed files with 373 additions and 890 deletions.
diff --git a/docs/metasploit-framework.wiki/How-to-use-datastore-options.md b/docs/metasploit-framework.wiki/How-to-use-datastore-options.md
@@ -86,8 +86,7 @@ OptSomething.new(option_name, [boolean, description, value, *enums*], aliases: *
   options](#Filtering-datastore-options) section for more information.
 * **fallbacks** *optional*, *key-word only* An array of names that will be used as a fallback if the main option name is
   defined by the user. This is useful in the scenario of wanting specialised option names such as `SMBUser`, but to also
-  support gracefully checking a list of more generic fallbacks option names such as `Username`. This functionality is 
-  currently behind a feature flag, set with `features set datastore_fallbacks true` in msfconsole
+  support gracefully checking a list of more generic fallbacks option names such as `Username`.
 
 Now let's talk about what classes are available:
 

diff --git a/lib/msf/base/serializer/readable_text.rb b/lib/msf/base/serializer/readable_text.rb
@@ -623,7 +623,7 @@ def self.options_table(missing, mod, options, indent)
     )
     options.sort_by(&:name).each do |opt|
       name = opt.name
-      if mod.datastore.is_a?(Msf::DataStoreWithFallbacks)
+      if mod.datastore.is_a?(Msf::DataStore)
         val = mod.datastore[name]
       else
         val = mod.datastore[name].nil? ? opt.default : mod.datastore[name]