Add option to reload all libs when running a module

sjanusz-r7 · Sep 18, 2023 · 1499e4c · 1499e4c
1 parent 1378bfb
commit 1499e4c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/lib/msf/ui/console/command_dispatcher.rb b/lib/msf/ui/console/command_dispatcher.rb
@@ -62,6 +62,15 @@ def active_session=(mod)
     driver.active_session = mod
   end
 
+  #
+  # Gets the dispatcher of a specific class
+  # Returns nil if there are no dispatchers of the specific class in the stack,
+  # otherwise returns the first dispatcher of class klass.
+  #
+  def dispatcher(klass)
+    driver.dispatcher_stack.find { |d| d.instance_of?(klass) }
+  end
+
   #
   # Logs an error message to the screen and the log file.  The callstack is
   # also printed.

diff --git a/lib/msf/ui/console/command_dispatcher/auxiliary.rb b/lib/msf/ui/console/command_dispatcher/auxiliary.rb
@@ -63,6 +63,8 @@ def cmd_run(*args, action: nil)
       return false
     end
 
+    dispatcher(::Msf::Ui::Console::CommandDispatcher::Developer)&.cmd_reload_lib('-a') if args[:reload_libs]
+
     begin
       # Check if this is a scanner module or doesn't target remote hosts
       if rhosts.blank? || mod.class.included_modules.include?(Msf::Auxiliary::Scanner)

diff --git a/lib/msf/ui/console/command_dispatcher/evasion.rb b/lib/msf/ui/console/command_dispatcher/evasion.rb
@@ -31,6 +31,8 @@ def cmd_run(*args)
       'LocalOutput' => driver.output
     }
 
+    dispatcher(::Msf::Ui::Console::CommandDispatcher::Developer)&.cmd_reload_lib('-a') if args[:reload_libs]
+
     begin
       mod.run_simple(opts)
     rescue ::Interrupt
@@ -64,6 +66,7 @@ def cmd_run_tabs(str, words)
         '-n' => [ framework.nops.map { |refname, mod| refname }     ],
         '-o' => [ true                                              ],
         '-p' => [ framework.payloads.map { |refname, mod| refname } ],
+        '-r' => [ nil                                               ],
         '-t' => [ true                                              ],
         '-z' => [ nil                                               ]
     }

diff --git a/lib/msf/ui/console/command_dispatcher/exploit.rb b/lib/msf/ui/console/command_dispatcher/exploit.rb
@@ -74,6 +74,7 @@ def cmd_run_tabs(str, words)
         '-n' => [ framework.nops.map { |refname, mod| refname }     ],
         '-o' => [ true                                              ],
         '-p' => [ framework.payloads.map { |refname, mod| refname } ],
+        '-r' => [ nil                                               ],
         '-t' => [ true                                              ],
         '-z' => [ nil                                               ]
     }
@@ -138,6 +139,7 @@ def cmd_exploit(*args)
       return false
     end
 
+    dispatcher(::Msf::Ui::Console::CommandDispatcher::Developer)&.cmd_reload_lib('-a') if args[:reload_libs]
 
     if rhosts && has_rhosts_option
       rhosts_walker = Msf::RhostsWalker.new(rhosts, mod_with_opts.datastore)

diff --git a/lib/msf/ui/console/command_dispatcher/post.rb b/lib/msf/ui/console/command_dispatcher/post.rb
@@ -74,6 +74,8 @@ def cmd_run(*args, action: nil)
       jobify = true
     end
 
+    dispatcher(::Msf::Ui::Console::CommandDispatcher::Developer)&.cmd_reload_lib('-a') if args[:reload_libs]
+
     begin
       mod.run_simple(
         'Action'         => args[:action],

diff --git a/lib/msf/ui/console/module_argument_parsing.rb b/lib/msf/ui/console/module_argument_parsing.rb
@@ -17,11 +17,12 @@ module ModuleArgumentParsing
 
   # Options which are standard and predictable across all modules
   @@module_opts = Rex::Parser::Arguments.new(
-    ['-h', '--help']       => [ false, 'Help banner.'                                                       ],
-    ['-j', '--job']        => [ false, 'Run in the context of a job.'                                       ],
-    ['-J', '--foreground'] => [ false, 'Force running in the foreground, even if passive.'                  ],
-    ['-o', '--options']    => [ true,  'A comma separated list of options in VAR=VAL format.', '<options>'  ],
-    ['-q', '--quiet']      => [ false, 'Run the module in quiet mode with no output'                        ]
+    ['-h', '--help']        => [ false, 'Help banner.'                                                       ],
+    ['-j', '--job']         => [ false, 'Run in the context of a job.'                                       ],
+    ['-J', '--foreground']  => [ false, 'Force running in the foreground, even if passive.'                  ],
+    ['-o', '--options']     => [ true,  'A comma separated list of options in VAR=VAL format.', '<options>'  ],
+    ['-q', '--quiet']       => [ false, 'Run the module in quiet mode with no output'                        ],
+    ['-r', '--reload-libs'] => [ false, 'Reload all libraries before running.'                               ]
   )
 
   @@module_opts_with_action_support = @@module_opts.merge(
@@ -41,7 +42,7 @@ def parse_check_opts(args)
     help_cmd = proc do |_result|
       cmd_check_help
     end
-    parse_opts(@@module_opts_with_action_support, args, help_cmd: help_cmd)&.slice(:datastore_options)
+    parse_opts(@@module_opts_with_action_support, args, help_cmd: help_cmd)&.slice(:datastore_options, :reload_libs)
   end
 
   def parse_run_opts(args, action: nil)
@@ -127,6 +128,8 @@ def parse_opts(opts, args, help_cmd:, action: nil)
         end
       when '-p'
         result[:payload] = val
+      when '-r'
+        result[:reload_libs] = true
       when '-t'
         result[:target] = val.to_i
       when '-z'

diff --git a/lib/msf/ui/console/module_command_dispatcher.rb b/lib/msf/ui/console/module_command_dispatcher.rb
@@ -147,6 +147,8 @@ def cmd_check(*args)
       return false
     end
 
+    dispatcher(::Msf::Ui::Console::CommandDispatcher::Developer)&.cmd_reload_lib('-a') if args[:reload_libs]
+
     begin
       check_multiple(mod_with_opts)
     rescue ::Interrupt