Land rapid7#9110, added -C option to change default hosts columns

Author: busterb

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

@@ -354,6 +354,8 @@ def delete_host_tag(rws, tag_name)
     end
   end
 
+  @@hosts_columns = [ 'address', 'mac', 'name', 'os_name', 'os_flavor', 'os_sp', 'purpose', 'info', 'comments']
+
   def cmd_hosts(*args)
     return unless active?
   ::ActiveRecord::Base.connection_pool.with_connection {
@@ -371,7 +373,7 @@ def cmd_hosts(*args)
     default_columns << 'tags' # Special case
     virtual_columns = [ 'svcs', 'vulns', 'workspace', 'tags' ]
 
-    col_search = [ 'address', 'mac', 'name', 'os_name', 'os_flavor', 'os_sp', 'purpose', 'info', 'comments']
+    col_search = @@hosts_columns
 
     default_columns.delete_if {|v| (v[-2,2] == "id")}
     while (arg = args.shift)
@@ -380,7 +382,7 @@ def cmd_hosts(*args)
         mode << :add
       when '-d','--delete'
         mode << :delete
-      when '-c'
+      when '-c','-C'
         list = args.shift
         if(!list)
           print_error("Invalid column list")
@@ -394,6 +396,10 @@ def cmd_hosts(*args)
             return
           end
         }
+        if (arg == '-C')
+          @@hosts_columns = col_search
+        end
+ 
       when '-u','--up'
         onlyup = true
       when '-o'
@@ -426,6 +432,7 @@ def cmd_hosts(*args)
         print_line "  -a,--add          Add the hosts instead of searching"
         print_line "  -d,--delete       Delete the hosts instead of searching"
         print_line "  -c <col1,col2>    Only show the given columns (see list below)"
+        print_line "  -C <col1,col2>    Only show the given columns until the next restart (see list below)"
         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"

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

@@ -125,6 +125,7 @@
           "  -a,--add          Add the hosts instead of searching",
           "  -d,--delete       Delete the hosts instead of searching",
           "  -c <col1,col2>    Only show the given columns (see list below)",
+          "  -C <col1,col2>    Only show the given columns until the next restart (see list below)",
           "  -h,--help         Show this help information",
           "  -u,--up           Only show hosts which are up",
           "  -o <file>         Send output to a file in csv format",