Remove terminal and tweak sessions

Hopefully everyone is now happy!

Author: OJ

features/commands/help.feature

@@ -26,7 +26,6 @@ Feature: Help command
           quit          Exit the console
           route         Route traffic through a session
           save          Saves the active datastores
-          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

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

@@ -114,7 +114,6 @@ def commands
       "set"        => "Sets a context-specific variable to a value",
       "setg"       => "Sets a global variable to a value",
       "sleep"      => "Do nothing for the specified number of seconds",
-      "terminal"   => "Interact with a given session",
       "threads"    => "View and manipulate background threads",
       "unload"     => "Unload a framework plugin",
       "unset"      => "Unsets one or more context-specific variables",
@@ -988,33 +987,14 @@ def cmd_spool(*args)
     return
   end
 
-  def cmd_terminal_help
-    print_line('Usage: terminal <session id>')
-    print_line
-    print_line('Interact with the given session ID.')
-    print_line('This works the same as: sessions -i <session id>')
-    print_line
-  end
-
-  #
-  # Helper function to quickly select a session
-  #
-  def cmd_terminal(*args)
-    if args.length == 0 || args[0].to_i == 0
-      cmd_terminal_help
-    else
-      cmd_sessions('-i', args[0])
-    end
-  end
-
   def cmd_sessions_help
-    print_line "Usage: sessions [options]"
+    print_line('Usage: sessions [options] or sessions [id]')
     print_line
-    print_line "Active session manipulation and interaction."
+    print_line('Active session manipulation and interaction.')
     print(@@sessions_opts.usage)
     print_line
-    print_line "Many options allow specifying session ranges using commas and dashes."
-    print_line "For example:  sessions -s checkvm -i 1,3-5  or  sessions -k 1-2,5,6"
+    print_line('Many options allow specifying session ranges using commas and dashes.')
+    print_line('For example:  sessions -s checkvm -i 1,3-5  or  sessions -k 1-2,5,6')
     print_line
   end
 
@@ -1037,58 +1017,63 @@ def cmd_sessions(*args)
     # be put in here
     extra   = []
 
-    # Parse the command options
-    @@sessions_opts.parse(args) do |opt, idx, val|
-      case opt
-      when "-q"
-        quiet = true
-      # Run a command on all sessions, or the session given with -i
-      when "-c"
-        method = 'cmd'
-        cmds << val if val
-      when "-C"
-          method = 'meterp-cmd'
+    if args.length == 1 && args[0] =~ /-?\d+/
+      method = 'interact'
+      sid = args[0].to_i
+    else
+      # Parse the command options
+      @@sessions_opts.parse(args) do |opt, idx, val|
+        case opt
+        when '-q'
+          quiet = true
+        # Run a command on all sessions, or the session given with -i
+        when '-c'
+          method = 'cmd'
           cmds << val if val
-      when "-x"
-        show_extended = true
-      when "-v"
-        verbose = true
-      # Do something with the supplied session identifier instead of
-      # all sessions.
-      when "-i"
-        sid = val
-      # Display the list of active sessions
-      when "-l"
-        method = 'list'
-      when "-k"
-        method = 'kill'
-        sid = val || false
-      when "-K"
-        method = 'killall'
-      # Run a script on all meterpreter sessions
-      when "-s"
-        unless script
-          method = 'scriptall'
-          script = val
-        end
-      # Upload and exec to the specific command session
-      when "-u"
-        method = 'upexec'
-        sid = val || false
-      # Reset the ring buffer read pointer
-      when "-r"
-        reset_ring = true
-        method = 'reset_ring'
-      # Display help banner
-      when "-h"
-        cmd_sessions_help
-        return false
-      when "-t"
-        if val.to_s =~ /^\d+$/
-          response_timeout = val.to_i
+        when '-C'
+            method = 'meterp-cmd'
+            cmds << val if val
+        when '-x'
+          show_extended = true
+        when '-v'
+          verbose = true
+        # Do something with the supplied session identifier instead of
+        # all sessions.
+        when '-i'
+          sid = val
+        # Display the list of active sessions
+        when '-l'
+          method = 'list'
+        when '-k'
+          method = 'kill'
+          sid = val || false
+        when '-K'
+          method = 'killall'
+        # Run a script on all meterpreter sessions
+        when '-s'
+          unless script
+            method = 'scriptall'
+            script = val
+          end
+        # Upload and exec to the specific command session
+        when '-u'
+          method = 'upexec'
+          sid = val || false
+        # Reset the ring buffer read pointer
+        when '-r'
+          reset_ring = true
+          method = 'reset_ring'
+        # Display help banner
+        when '-h'
+          cmd_sessions_help
+          return false
+        when '-t'
+          if val.to_s =~ /^\d+$/
+            response_timeout = val.to_i
+          end
+        else
+          extra << val
         end
-      else
-        extra << val
       end
     end
 

lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb

@@ -65,7 +65,7 @@ def commands
       "bgkill"     => "Kills a background meterpreter script",
       "get_timeouts" => "Get the current session timeout values",
       "set_timeouts" => "Set the current session timeout values",
-      "terminal"   => "Quickly switch to another session",
+      "sessions"   => "Quickly switch to another session",
       "bglist"     => "Lists running background scripts",
       "write"      => "Writes data to a channel",
       "enable_unicode_encoding"  => "Enables encoding of unicode strings",
@@ -118,17 +118,17 @@ def name
     "Core"
   end
 
-  def cmd_terminal_help
-    print_line('Usage: terminal <session id>')
+  def cmd_sessions_help
+    print_line('Usage: sessions <id>')
     print_line
     print_line('Interact with a different session Id.')
     print_line('This works the same as calling this from the MSF shell: sessions -i <session id>')
     print_line
   end
 
-  def cmd_terminal(*args)
+  def cmd_sessions(*args)
     if args.length == 0 || args[0].to_i == 0
-      cmd_terminal_help
+      cmd_sessions_help
     elsif args[0].to_s == client.name.to_s
       print_status("Session #{client.name} is already interactive.")
     else