Merge pull request rapid7#20097 from smashery/action_run_arg

Action run arg

Author: smcintyre-r7

lib/msf/base/simple/exploit.rb

@@ -65,6 +65,7 @@ def self.exploit_simple(oexploit, opts, &block)
 
       # Import options from the OptionStr or Option hash.
       exploit._import_extra_options(opts)
+      exploit.datastore['ACTION'] = opts['Action'] if opts['Action']
       opts['Payload'] ||= exploit.datastore['Payload']
 
       unless opts['Quiet']

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

@@ -124,6 +124,7 @@ def cmd_exploit(*args, opts: {})
       mod.options.include?('rhosts')
 
     opts = {
+      'Action'      => args[:action],
       'Encoder'     => args[:encoder] || mod_with_opts.datastore['ENCODER'],
       'Payload'     => args[:payload] || mod_with_opts.datastore['PAYLOAD'],
       'Target'      => args[:target] || mod_with_opts.datastore['TARGET'],

lib/msf/ui/console/module_argument_parsing.rb

@@ -61,7 +61,7 @@ def parse_exploit_opts(args)
     help_cmd = proc do |_result|
       cmd_exploit_help
     end
-    parse_opts(@@exploit_opts, args, help_cmd: help_cmd)&.except(:action)
+    parse_opts(@@exploit_opts, args, help_cmd: help_cmd)
   end
 
   def print_module_run_or_check_usage(command:, description: nil, options: @@module_opts)
@@ -149,7 +149,11 @@ def parse_opts(opts, args, help_cmd:, action: nil)
 
         if resembles_datastore_assignment?(val)
           name, val = val.split('=', 2)
-          append_datastore_option(datastore_options, name, val)
+          if name.upcase == 'ACTION'
+            result[:action] = val
+          else
+            append_datastore_option(datastore_options, name, val)
+          end
         elsif resembles_rhost_value?(val)
           append_datastore_option(datastore_options, 'RHOSTS', val)
         else

spec/msf/ui/console/module_argument_parsing_spec.rb

@@ -65,6 +65,18 @@
       expect(subject.send(opts[:method_name], ['-o', 'RHOSTS=192.168.172.1', '-o', 'RPORT=1337', '-o', 'rhosts=192.168.172.2'])).to include(expected_result)
     end
 
+    it 'allows setting action inline' do
+      expected_result = {
+        datastore_options: {
+          'RHOSTS' => '192.168.172.1',
+          'RPORT' => '1337',
+        }
+      }
+      expected_result[:action] = 'action-name' unless opts[:method_name] == 'parse_check_opts'
+      result = subject.send(opts[:method_name], ['RHOSTS=192.168.172.1', 'RPORT=1337', 'action=action-name'])
+      expect(result).to include(expected_result)
+    end
+
     it 'parses the option str directly into its components' do
       expected_result = {
         datastore_options: {
@@ -344,6 +356,7 @@ def cmd_exploit_help
     it 'handles no arguments being supplied' do
       args = []
       expected_result = {
+        action: nil,
         jobify: false,
         quiet: false,
         datastore_options: {}
@@ -377,6 +390,7 @@ def cmd_exploit_help
         'example.com'
       ]
       expected_result = {
+        action: nil,
         jobify: false,
         quiet: true,
         datastore_options: {