Land rapid7#7738, Add sort by column to services and hosts commands

Author: Brent Cook

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

@@ -360,6 +360,11 @@ def cmd_hosts(*args)
         onlyup = true
       when '-o'
         output = args.shift
+      when '-O'
+        if (order_by = args.shift.to_i - 1) < 0
+          print_error('Please specify a column number starting from 1')
+          return
+        end
       when '-R', '--rhosts'
         set_rhosts = true
       when '-S', '--search'
@@ -386,6 +391,7 @@ def cmd_hosts(*args)
         print_line "  -h,--help         Show this help information"
         print_line "  -u,--up           Only show hosts which are up"
         print_line "  -o <file>         Send output to a file in csv format"
+        print_line "  -O <column>       Order rows by specified column number"
         print_line "  -R,--rhosts       Set RHOSTS from the results of the search"
         print_line "  -S,--search       Search string to filter by"
         print_line "  -i,--info         Change the info of a host"
@@ -425,8 +431,9 @@ def cmd_hosts(*args)
     # If we got here, we're searching.  Delete implies search
     tbl = Rex::Text::Table.new(
       {
-        'Header'  => "Hosts",
-        'Columns' => col_names,
+        'Header'    => "Hosts",
+        'Columns'   => col_names,
+        'SortIndex' => order_by
       })
 
     # Sentinal value meaning all
@@ -586,6 +593,11 @@ def cmd_services(*args)
           return
         end
         output_file = ::File.expand_path(output_file)
+      when '-O'
+        if (order_by = args.shift.to_i - 1) < 0
+          print_error('Please specify a column number starting from 1')
+          return
+        end
       when '-R', '--rhosts'
         set_rhosts = true
       when '-S', '--search'
@@ -604,6 +616,7 @@ def cmd_services(*args)
         print_line "  -r <protocol>     Only show [tcp|udp] services"
         print_line "  -u,--up           Only show services which are up"
         print_line "  -o <file>         Send output to a file in csv format"
+        print_line "  -O <column>       Order rows by specified column number"
         print_line "  -R,--rhosts       Set RHOSTS from the results of the search"
         print_line "  -S,--search       Search string to filter by"
         print_line
@@ -651,8 +664,9 @@ def cmd_services(*args)
       col_names = col_search
     end
     tbl = Rex::Text::Table.new({
-        'Header'  => "Services",
-        'Columns' => ['host'] + col_names,
+        'Header'    => "Services",
+        'Columns'   => ['host'] + col_names,
+        'SortIndex' => order_by
       })
 
     # Sentinal value meaning all

spec/lib/msf/ui/console/command_dispatcher/db_spec.rb

@@ -387,6 +387,7 @@
           "  -h,--help         Show this help information",
           "  -u,--up           Only show hosts which are up",
           "  -o <file>         Send output to a file in csv format",
+          "  -O <column>       Order rows by specified column number",
           "  -R,--rhosts       Set RHOSTS from the results of the search",
           "  -S,--search       Search string to filter by",
           "  -i,--info         Change the info of a host",
@@ -462,6 +463,7 @@
           "  -r <protocol>     Only show [tcp|udp] services",
           "  -u,--up           Only show services which are up",
           "  -o <file>         Send output to a file in csv format",
+          "  -O <column>       Order rows by specified column number",
           "  -R,--rhosts       Set RHOSTS from the results of the search",
           "  -S,--search       Search string to filter by",
           "Available columns: created_at, info, name, port, proto, state, updated_at"