Land rapid7#7655, Refactor/cleanup core command dispatcher

Author: Brent Cook

features/commands/help.feature

@@ -1,7 +1,7 @@
 Feature: Help command
 
   Background:
-    Given I run `msfconsole --defer-module-loads -x help -x exit`
+    Given I run `msfconsole --defer-module-loads -q -x help -x exit`
 
   Scenario: The 'help' command's output
     Then the output should contain:
@@ -12,51 +12,72 @@ Feature: Help command
           Command       Description
           -------       -----------
           ?             Help menu
-          advanced      Displays advanced options for one or more modules
-          back          Move back from the current context
           banner        Display an awesome metasploit banner
           cd            Change the current working directory
           color         Toggle color
           connect       Communicate with a host
-          edit          Edit the current module with $VISUAL or $EDITOR
           exit          Exit the console
           get           Gets the value of a context-specific variable
           getg          Gets the value of a global variable
           grep          Grep the output of another command
           help          Help menu
-          info          Displays information about one or more modules
           irb           Drop into irb scripting mode
-          jobs          Displays and manages jobs
-          kill          Kill a job
           load          Load a framework plugin
-          loadpath      Searches for and loads modules from a path
-          makerc        Save commands entered since start to a file
-          options       Displays global options or for one or more modules
-          popm          Pops the latest module off the stack and makes it active
-          previous      Sets the previously loaded module as the current module
-          pushm         Pushes the active or list of modules onto the module stack
           quit          Exit the console
-          reload_all    Reloads all modules from all defined module paths
-          rename_job    Rename a job
-          resource      Run the commands stored in a file
           route         Route traffic through a session
           save          Saves the active datastores
-          search        Searches module names and descriptions
           sess          Interact with a given session
           sessions      Dump session listings and display information about sessions
           set           Sets a context-specific variable to a value
           setg          Sets a global variable to a value
-          show          Displays modules of a given type, or all modules
           sleep         Do nothing for the specified number of seconds
           spool         Write console output into a file as well the screen
           threads       View and manipulate background threads
           unload        Unload a framework plugin
           unset         Unsets one or more context-specific variables
           unsetg        Unsets one or more global variables
-          use           Selects a module by name
           version       Show the framework and console library version numbers
 
 
+      Module Commands
+      ===============
+
+          Command       Description
+          -------       -----------
+          advanced      Displays advanced options for one or more modules
+          back          Move back from the current context
+          edit          Edit the current module with $VISUAL or $EDITOR
+          info          Displays information about one or more modules
+          loadpath      Searches for and loads modules from a path
+          options       Displays global options or for one or more modules
+          popm          Pops the latest module off the stack and makes it active
+          previous      Sets the previously loaded module as the current module
+          pushm         Pushes the active or list of modules onto the module stack
+          reload_all    Reloads all modules from all defined module paths
+          search        Searches module names and descriptions
+          show          Displays modules of a given type, or all modules
+          use           Selects a module by name
+
+
+      Job Commands
+      ============
+
+          Command       Description
+          -------       -----------
+          jobs          Displays and manages jobs
+          kill          Kill a job
+          rename_job    Rename a job
+
+
+      Resource Script Commands
+      ========================
+
+          Command       Description
+          -------       -----------
+          makerc        Save commands entered since start to a file
+          resource      Run the commands stored in a file
+
+
       Database Backend Commands
       =========================
 

lib/msf/ui/console/command_dispatcher.rb

@@ -74,6 +74,36 @@ def log_error(err)
     dlog("Call stack:\n#{$@.join("\n")}", 'core', LEV_1)
   end
 
+  #
+  # Generate an array of job or session IDs from a given range String.
+  # Always returns an Array.
+  #
+  # @param id_list [String] Range or list description such as 1-5 or 1,3,5 etc
+  # @return [Array<String>] Representing the range
+  def build_range_array(id_list)
+    item_list = []
+    unless id_list.blank?
+      temp_list = id_list.split(',')
+      temp_list.each do |ele|
+        return if ele.count('-') > 1
+        return if ele.first == '-' || ele[-1] == '-'
+        return if ele.first == '.' || ele[-1] == '.'
+
+        if ele.include? '-'
+          temp_array = (ele.split("-").inject { |s, e| s.to_i..e.to_i }).to_a
+          item_list.concat(temp_array)
+        elsif ele.include? '..'
+          temp_array = (ele.split("..").inject { |s, e| s.to_i..e.to_i }).to_a
+          item_list.concat(temp_array)
+        else
+          item_list.push(ele.to_i)
+        end
+      end
+    end
+
+    item_list.uniq.sort
+  end
+
   #
   # The driver that this command dispatcher is associated with.
   #