Missed a file in the merge somehow

Author: jbarnett-r7

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

@@ -434,6 +434,8 @@ def delete_host_tag(rws, tag_name)
 
           end
 
+          @@hosts_columns = [ 'address', 'mac', 'name', 'os_name', 'os_flavor', 'os_sp', 'purpose', 'info', 'comments']
+
           def cmd_hosts(*args)
             return unless active?
             onlyup = false
@@ -477,7 +479,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)
@@ -486,7 +488,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")
@@ -500,6 +502,10 @@ def cmd_hosts(*args)
                       return
                     end
                   }
+                  if (arg == '-C')
+                    @@hosts_columns = col_search
+                  end
+
                 when '-u','--up'
                   onlyup = true
                 when '-o'
@@ -532,6 +538,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"
@@ -1219,7 +1226,7 @@ def make_sortable(input)
           def cmd_loot_help
             print_line "Usage: loot <options>"
             print_line " Info: loot [-h] [addr1 addr2 ...] [-t <type1,type2>]"
-            print_line "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] [-t [type]"
+            print_line "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] -t [type]"
             print_line "  Del: loot -d [addr1 addr2 ...]"
             print_line
             print_line "  -a,--add          Add loot to the list of addresses, instead of listing"
@@ -1295,6 +1302,10 @@ def cmd_loot(*args)
             host_ranges.push(nil) if host_ranges.empty?
 
             if mode == :add
+              if host_ranges.compact.empty?
+                print_error('Address list required')
+                return
+              end
               if info.nil?
                 print_error("Info required")
                 return
@@ -1309,17 +1320,18 @@ def cmd_loot(*args)
               end
               type = types.first
               name = File.basename(filename)
+              file = File.open(filename, "rb")
+              contents = file.read
               host_ranges.each do |range|
                 range.each do |host|
-                  file = File.open(filename, "rb")
-                  contents = file.read
                   lootfile = framework.db.find_or_create_loot(:type => type, :host => host, :info => info, :data => contents, :path => filename, :name => name)
                   print_status("Added loot for #{host} (#{lootfile})")
                 end
               end
               return
             end
 
+
             each_host_range_chunk(host_ranges) do |host_search|
               framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
                 loots = framework.db.loots(framework.db.workspace, {:host_id => host.id})
@@ -1928,6 +1940,8 @@ def db_parse_db_uri_postgresql(path)
             if (path)
               auth, dest = path.split('@')
               (dest = auth and auth = nil) if not dest
+              # remove optional scheme in database url
+              auth = auth.sub(/^\w+:\/\//, "") if auth
               res[:user],res[:pass] = auth.split(':') if auth
               targ,name = dest.split('/')
               (name = targ and targ = nil) if not name