Merge in db console commands for search

Incorporates search option from @sempervictus , fixing a couple issues
along the way. This resolves Redmine issue #6185.

[Closes #107]

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

@@ -162,6 +162,7 @@ class Db
 			delete_count = 0
 
 			host_ranges = []
+			search_term = nil
 
 			output = nil
 			default_columns = ::Msf::DBManager::Host.column_names.sort
@@ -197,6 +198,8 @@ class Db
 				when '-R','--rhosts'
 					set_rhosts = true
 					rhosts = []
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 
 				when '-h','--help'
 					print_line "Usage: hosts [ options ] [addr1 addr2 ...]"
@@ -209,6 +212,7 @@ class Db
 					print_line "  -u,--up           Only show hosts which are up"
 					print_line "  -o <file>         Send output to a file in csv format"
 					print_line "  -R,--rhosts       Set RHOSTS from the results of the search"
+					print_line "  -S,--search       Search string to filter by"
 					print_line
 					print_line "Available columns: #{default_columns.join(", ")}"
 					print_line
@@ -255,6 +259,9 @@ class Db
 
 			each_host_range_chunk(host_ranges) do |host_search|
 				framework.db.hosts(framework.db.workspace, onlyup, host_search).each do |host|
+					if search_term
+						next unless host.attribute_names.any? { |a| host[a.intern].to_s.match(search_term) }
+					end
 					columns = col_names.map do |n|
 						# Deal with the special cases
 						if virtual_columns.include?(n)
@@ -316,6 +323,7 @@ class Db
 			host_ranges = []
 			port_ranges = []
 			delete_count = 0
+			search_term = nil
 
 			# option parsing
 			while (arg = args.shift)
@@ -367,6 +375,8 @@ class Db
 				when '-R','--rhosts'
 					set_rhosts = true
 					rhosts = []
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 
 				when '-h','--help'
 					print_line
@@ -382,6 +392,7 @@ class Db
 					print_line "  -u,--up           Only show services which are up"
 					print_line "  -o <file>         Send output to a file in csv format"
 					print_line "  -R,--rhosts       Set RHOSTS from the results of the search"
+					print_line "  -S,--search       Search string to filter by"
 					print_line
 					print_line "Available columns: #{default_columns.join(", ")}"
 					print_line
@@ -440,6 +451,13 @@ class Db
 				framework.db.services(framework.db.workspace, onlyup, proto, host_search, ports, names).each do |service|
 
 					host = service.host
+					if search_term
+						next unless(
+							host.attribute_names.any? { |a| host[a.intern].to_s.match(search_term)} or
+							service.attribute_names.any? { |a| service[a.intern].to_s.match(search_term)}
+						)
+					end
+
 					columns = [host.address] + col_names.map { |n| service[n].to_s || "" }
 					tbl << columns
 					if set_rhosts
@@ -479,6 +497,7 @@ class Db
 			print_line "  -h,--help             Show this help information"
 			print_line "  -p,--port <portspec>  List vulns matching this port spec"
 			print_line "  -s <svc names>        List vulns matching these service names"
+			print_line "  -S,--search           Search string to filter by"
 			print_line
 			print_line "Examples:"
 			print_line "  vulns -p 1-65536          # only vulns with associated services"
@@ -493,6 +512,7 @@ class Db
 			host_ranges = []
 			port_ranges = []
 			svcs        = []
+			search_term = nil
 
 			# Short-circuit help
 			if args.delete "-h"
@@ -521,6 +541,8 @@ class Db
 						return
 					end
 					svcs = service.split(/[\s]*,[\s]*/)
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 				else
 					# Anything that wasn't an option is a host to search for
 					unless (arg_host_range(arg, host_ranges))
@@ -537,6 +559,12 @@ class Db
 			each_host_range_chunk(host_ranges) do |host_search|
 				framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
 					host.vulns.each do |vuln|
+						if search_term
+							next unless(
+								vuln.host.attribute_names.any? { |a| vuln.host[a.intern].to_s.match(search_term) } or
+								vuln.attribute_names.any? { |a| vuln[a.intern].to_s.match(search_term) }
+							)
+						end
 						reflist = vuln.refs.map { |r| r.name }
 						if(vuln.service)
 							# Skip this one if the user specified a port and it
@@ -570,6 +598,7 @@ class Db
 			print_line "  -u,--user             Add a cred for this user (only with -a). Default: blank"
 			print_line "  -P,--password         Add a cred with this password (only with -a). Default: blank"
 			print_line "  -R,--rhosts           Set RHOSTS from the results of the search"
+			print_line "  -S,--search           Search string to filter by"
 			print_line
 			print_line "Examples:"
 			print_line "  creds               # Default, returns all active credentials"
@@ -597,6 +626,7 @@ class Db
 			host_ranges = []
 			port_ranges = []
 			svcs        = []
+			search_term = nil
 
 			user = nil
 
@@ -649,6 +679,8 @@ class Db
 				when "-R"
 					set_rhosts = true
 					rhosts = []
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 				when "-u","--user"
 					user = args.shift
 					if (!user)
@@ -709,7 +741,9 @@ class Db
 			framework.db.each_cred(framework.db.workspace) do |cred|
 				# skip if it's inactive and user didn't ask for all
 				next unless (cred.active or inactive_ok)
-
+				if search_term
+					next unless cred.attribute_names.any? { |a| cred[a.intern].to_s.match(search_term) }
+				end
 				# Also skip if the user is searching for something and this
 				# one doesn't match
 				includes = false
@@ -766,6 +800,7 @@ class Db
 			print_line "  -t <type1,type2>  Search for a list of types"
 			print_line "  -h,--help         Show this help information"
 			print_line "  -R,--rhosts       Set RHOSTS from the results of the search"
+			print_line "  -S,--search       Search string to filter by"
 			print_line
 			print_line "Examples:"
 			print_line "  notes --add -t apps -n 'winzip' 10.1.1.34 10.1.20.41"
@@ -781,6 +816,7 @@ class Db
 			set_rhosts = false
 
 			host_ranges = []
+			search_term = nil
 
 			while (arg = args.shift)
 				case arg
@@ -804,6 +840,8 @@ class Db
 				when '-R','--rhosts'
 					set_rhosts = true
 					rhosts = []
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 				when '-h','--help'
 					cmd_notes_help
 					return
@@ -837,7 +875,7 @@ class Db
 			note_list = []
 			delete_count = 0
 			if host_ranges.empty? # No host specified - collect all notes
-				note_list = framework.db.notes
+				note_list = framework.db.notes.dup
 			else # Collect notes of specified hosts
 				each_host_range_chunk(host_ranges) do |host_search|
 					framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
@@ -845,6 +883,11 @@ class Db
 					end
 				end
 			end
+			if search_term
+				note_list.delete_if do |n|
+					!!n.attribute_names.any? { |a| n[a.intern].to_s.match(search_term) }
+				end
+			end
 			# Now display them
 			note_list.each do |note|
 				next if(types and types.index(note.ntype).nil?)
@@ -881,6 +924,7 @@ class Db
 			print_line
 			print_line "  -t <type1,type2>  Search for a list of types"
 			print_line "  -h,--help         Show this help information"
+			print_line "  -S,--search       Search string to filter by"
 			print_line
 		end
 
@@ -890,6 +934,7 @@ class Db
 			host_ranges = []
 			types = nil
 			delete_count = 0
+			search_term = nil
 
 			while (arg = args.shift)
 				case arg
@@ -902,6 +947,8 @@ class Db
 						return
 					end
 					types = typelist.strip().split(",")
+				when '-S', '--search'
+					search_term = /#{args.shift}/nmi
 				when '-h','--help'
 					cmd_loot_help
 					return
@@ -925,6 +972,12 @@ class Db
 				framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
 					host.loots.each do |loot|
 						next if(types and types.index(loot.ltype).nil?)
+						if search_term
+						next unless(
+							loot.attribute_names.any? { |a| loot[a.intern].to_s.match(search_term) } or
+							loot.host.attribute_names.any? { |a| loot.host[a.intern].to_s.match(search_term) }
+						)
+						end
 						row = []
 						row.push( (loot.host ? loot.host.address : "") )
 						if (loot.service)