cosmetic touchups

Author: David Maloney

features/commands/help.feature

@@ -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
       =========================
 
@@ -76,5 +97,19 @@ Feature: Help command
           services          List all services in the database
           vulns             List all vulnerabilities in the database
           workspace         Switch between database workspaces
+
+
+      Auxiliary Commands
+      ==================
+
+          Command       Description
+          -------       -----------
+          check         Check to see if a target is vulnerable
+          exploit       This is an alias for the run command
+          pry           Open a Pry session on the current module
+          reload        Reloads the auxiliary module
+          rerun         Reloads and launches the auxiliary module
+          rexploit      This is an alias for the rerun command
+          run           Launches the auxiliary module
       """
 

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

@@ -91,10 +91,6 @@ class Core
     "-e" => [ true,  "Expression to evaluate."                        ])
 
 
-
-  # Constant for a retry timeout on using modules before they're loaded
-  CMD_USE_TIMEOUT = 3
-
   # Returns the list of commands supported by this command dispatcher
   def commands
     {

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

@@ -39,7 +39,7 @@ def commands
     # Returns the name of the command dispatcher.
     #
     def name
-      "Jobs"
+      "Job"
     end
 
     def cmd_rename_job_help

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

@@ -19,6 +19,9 @@ class Modules
 
           include Msf::Ui::Console::CommandDispatcher
 
+          # Constant for a retry timeout on using modules before they're loaded
+          CMD_USE_TIMEOUT = 3
+
           # Constant for disclosure date formatting in search functions
           DISCLOSURE_DATE_FORMAT = "%Y-%m-%d"
 
@@ -60,7 +63,7 @@ def initialize(driver)
           # Returns the name of the command dispatcher.
           #
           def name
-            "Modules"
+            "Module"
           end
 
 

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

@@ -31,7 +31,7 @@ def commands
           # Returns the name of the command dispatcher.
           #
           def name
-            "Resource Scripts"
+            "Resource Script"
           end
 
           def cmd_resource_help