Rename dump_auxiliary_action{,s}

To dump_module_action{,s} to accommodate post modules, etc.

Author: wvu

lib/msf/base/serializer/readable_text.rb

@@ -84,14 +84,14 @@ def self.dump_exploit_target(mod, indent = '', h = nil)
     tbl.to_s + "\n"
   end
 
-  # Dumps an auxiliary's actions
+  # Dumps a module's actions
   #
-  # @param mod [Msf::Auxiliary] the auxiliary module.
+  # @param mod [Msf::Module] the module.
   # @param indent [String] the indentation to use (only the length
   #   matters)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
-  def self.dump_auxiliary_actions(mod, indent = '', h = nil)
+  def self.dump_module_actions(mod, indent = '', h = nil)
     tbl = Rex::Ui::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
@@ -108,14 +108,14 @@ def self.dump_auxiliary_actions(mod, indent = '', h = nil)
     tbl.to_s + "\n"
   end
 
-  # Dumps the auxiliary's selected action
+  # Dumps the module's selected action
   #
-  # @param mod [Msf::Auxiliary] the auxiliary module.
+  # @param mod [Msf::Module] the module.
   # @param indent [String] the indentation to use (only the length
   #   matters)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
-  def self.dump_auxiliary_action(mod, indent = '', h = nil)
+  def self.dump_module_action(mod, indent = '', h = nil)
     tbl = Rex::Ui::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,

lib/msf/ui/console/command_dispatcher/core.rb

@@ -3148,7 +3148,7 @@ def show_options(mod) # :nodoc:
 
     # Print the selected action
     if mod.kind_of?(Msf::Module::HasActions)
-      mod_action = Serializer::ReadableText.dump_auxiliary_action(mod, '   ')
+      mod_action = Serializer::ReadableText.dump_module_action(mod, '   ')
       print("\n#{mod.type.capitalize} action:\n\n#{mod_action}\n") if (mod_action and mod_action.length > 0)
     end
 
@@ -3208,8 +3208,8 @@ def show_targets(mod) # :nodoc:
   end
 
   def show_actions(mod) # :nodoc:
-    mod_actions = Serializer::ReadableText.dump_auxiliary_actions(mod, '   ')
-    print("\nAuxiliary actions:\n\n#{mod_actions}\n") if (mod_actions and mod_actions.length > 0)
+    mod_actions = Serializer::ReadableText.dump_module_actions(mod, '   ')
+    print("\n#{mod.type.capitalize} actions:\n\n#{mod_actions}\n") if (mod_actions and mod_actions.length > 0)
   end
 
   def show_advanced_options(mod) # :nodoc:

msfcli

@@ -428,7 +428,7 @@ class Msfcli
 
   def show_actions(m)
     readable = Msf::Serializer::ReadableText
-    $stdout.puts("\n" + readable.dump_auxiliary_actions(m[:module], @indent))
+    $stdout.puts("\n" + readable.dump_module_actions(m[:module], @indent))
   end