Land rapid7#8596, Fix rex arguments parser to handle adjacent flags

Author: wwebb-r7

lib/rex/parser/arguments.rb

@@ -43,20 +43,20 @@ def parse(args, &_block)
             next
           end
 
-          if arg[0] == '-'
-            cfs = arg[0..2]
+          if arg.length > 1 && arg[0] == '-' && arg[1] != '-'
+            arg.split('').each do |flag|
+              fmt.each_pair do |fmtspec, val|
+                next if fmtspec != "-#{flag}"
 
-            fmt.each_pair do |fmtspec, val|
-              next if fmtspec != cfs
+                param = nil
 
-              param = nil
+                if val[0]
+                  param = args[idx + 1]
+                  skip_next = true
+                end
 
-              if val[0]
-                param = args[idx + 1]
-                skip_next = true
+                yield fmtspec, idx, param
               end
-
-              yield fmtspec, idx, param
             end
           else
             yield nil, idx, arg

lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb

@@ -71,6 +71,20 @@ class Console::CommandDispatcher::Stdapi::Sys
     "-c" => [ false, "Filter only child processes of the current shell" ],
     "-h" => [ false, "Help menu." ])
 
+  #
+  # Options for the 'pgrep' command.
+  #
+  @@pgrep_opts = Rex::Parser::Arguments.new(
+    "-S" => [ true,  "Filter on process name" ],
+    "-U" => [ true,  "Filter on user name" ],
+    "-A" => [ true,  "Filter on architecture" ],
+    "-x" => [ false, "Filter for exact matches rather than regex" ],
+    "-s" => [ false, "Filter only SYSTEM processes" ],
+    "-c" => [ false, "Filter only child processes of the current shell" ],
+    "-l" => [ false, "Display process name with PID" ],
+    "-f" => [ false, "Display process path and args with PID (combine with -l)" ],
+    "-h" => [ false, "Help menu." ])
+
   #
   # Options for the 'suspend' command.
   #
@@ -418,9 +432,19 @@ def cmd_pkill_help
   # Filters processes by name
   #
   def cmd_pgrep(*args)
-    if args.include?('-h')
-      cmd_pgrep_help
-      return true
+    f_flag = false
+    l_flag = false
+
+    @@pgrep_opts.parse(args) do |opt, idx, val|
+      case opt
+      when '-h'
+        cmd_pgrep_help
+        return true
+      when '-l'
+        l_flag = true
+      when '-f'
+        f_flag = true
+      end
     end
 
     all_processes = client.sys.process.get_processes
@@ -430,10 +454,6 @@ def cmd_pgrep(*args)
       return true
     end
 
-    # XXX fix Rex parser to properly handle adjacent short flags
-    f_flag = args.include?('-f') || args.include?('-lf') || args.include?('-fl')
-    l_flag = args.include?('-l') || args.include?('-lf') || args.include?('-fl')
-
     processes.each do |p|
       if l_flag
         if f_flag
@@ -451,7 +471,7 @@ def cmd_pgrep(*args)
   def cmd_pgrep_help
     print_line("Usage: pgrep [ options ] pattern")
     print_line("Filter processes by name.")
-    print_line @@ps_opts.usage
+    print_line @@pgrep_opts.usage
   end
 
   #