add -R capability like hosts -R

moves the set_rhosts method def out into a separate file so it can be
included by both db.rb cmd_hosts and core.rb cmd_grep

Author: kernelsmith

lib/msf/core/set_rhosts.rb

@@ -0,0 +1,36 @@
+#
+# Set RHOSTS in the +active_module+'s (or global if none) datastore from an array of addresses
+#
+# This stores all the addresses to a temporary file and utilizes the
+# <pre>file:/tmp/filename</pre> syntax to confer the addrs.  +rhosts+
+# should be an Array.  NOTE: the temporary file is *not* deleted
+# automatically.
+#
+def set_rhosts_from_addrs(rhosts)
+	if rhosts.empty?
+		print_status "The list is empty, cowardly refusing to set RHOSTS"
+		return
+	end
+	if active_module
+		mydatastore = active_module.datastore
+	else
+		# if there is no module in use set the list to the global variable
+		mydatastore = self.framework.datastore
+	end
+
+	if rhosts.length > 5
+		# Lots of hosts makes 'show options' wrap which is difficult to
+		# read, store to a temp file
+		rhosts_file = Rex::Quickfile.new("msf-db-rhosts-")
+		mydatastore['RHOSTS'] = 'file:'+rhosts_file.path
+		# create the output file and assign it to the RHOSTS variable
+		rhosts_file.write(rhosts.join("\n")+"\n")
+		rhosts_file.close
+	else
+		# For short lists, just set it directly
+		mydatastore['RHOSTS'] = rhosts.join(" ")
+	end
+
+	print_line "RHOSTS => #{mydatastore['RHOSTS']}"
+	print_line
+end

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

@@ -20,6 +20,7 @@ module CommandDispatcher
 class Core
 
 	include Msf::Ui::Console::CommandDispatcher
+	require 'msf/core/set_rhosts'
 
 	# Session command options
 	@@sessions_opts = Rex::Parser::Arguments.new(
@@ -74,7 +75,8 @@ class Core
 		"-B" => [ true, "Show arg lines of output Before a match."        ],
 		"-s" => [ true, "Skip arg lines of output before attempting match."],
 		"-k" => [ true, "Keep (include) arg lines at start of output."    ],
-		"-c" => [ false, "Only print a count of matching lines."          ])
+		"-c" => [ false, "Only print a count of matching lines."          ],
+		"-R" => [ false, "Set RHOSTS with the results, can only be used when command output has 'addresses' as the first column" ])
 
 	@@search_opts = Rex::Parser::Arguments.new(
 		"-h" => [ false, "Help banner."                                   ])
@@ -2486,6 +2488,11 @@ def cmd_grep(*args)
 					# skip arg number of lines at the top of the output, useful for avoiding undesirable matches
 					output_mods[:skip] = val.to_i
 					args.shift(2)
+				when "-R"
+					output_mods[:set_rhosts] = true
+					args.shift
+					output_mods[:keep] = 6 unless output_mods[:keep].to_i > 6 # we need the column headers
+					rhosts = []
 			end
 		end
 		# after deleting parsed options, the only args left should be the pattern, the cmd to run, and cmd args
@@ -2555,7 +2562,25 @@ def temp_output.write(msg = '')
 
 		# now control output based on remaining output_mods such as :count
 		return print_status(count.to_s) if output_mods[:count]
-		our_lines.each {|line| print line}
+
+		if output_mods[:set_rhosts]
+			# we don't use the db to confirm these hosts because we want to keep grep independent of db status so we
+			# require the first column to be the addresses otherwise there's no good way to parse the table.to_s output
+			col_names_row_index = nil
+			our_lines.each_with_index do |line,idx|
+				if line =~ /^address/ # this is assumed to be the line w/the column names
+					col_names_row_index = idx
+					break
+				end
+			end
+			rhosts_row_start = col_names_row_index + 1
+			rhosts_row_start += 1 if our_lines[rhosts_row_start] =~ /^-+/ # skip the "-----" separator if present
+			row_of_interest = our_lines.slice(rhosts_row_start..-1)
+			rhosts = row_of_interest.map {|row| row.split(/\s/).first}
+			set_rhosts_from_addrs(rhosts)
+		else
+			our_lines.each {|line| print line}
+		end
 	end
 
 	#

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

@@ -11,6 +11,7 @@ module CommandDispatcher
 class Db
 
 		require 'tempfile'
+		require 'msf/core/set_rhosts'
 
 		include Msf::Ui::Console::CommandDispatcher
 
@@ -1476,7 +1477,7 @@ def cmd_db_rebuild_cache
 				print_error("The database is not connected")
 				return
 			end
-					
+
 			print_status("Purging and rebuilding the module cache in the background...")
 			framework.threads.spawn("ModuleCacheRebuild", true) do
 				framework.db.purge_all_module_details
@@ -1491,44 +1492,6 @@ def cmd_db_rebuild_cache_help
 			print_line
 		end
 
-		#
-		# Set RHOSTS in the +active_module+'s (or global if none) datastore from an array of addresses
-		#
-		# This stores all the addresses to a temporary file and utilizes the
-		# <pre>file:/tmp/filename</pre> syntax to confer the addrs.  +rhosts+
-		# should be an Array.  NOTE: the temporary file is *not* deleted
-		# automatically.
-		#
-		def set_rhosts_from_addrs(rhosts)
-			if rhosts.empty?
-				print_status "The list is empty, cowardly refusing to set RHOSTS"
-				return
-			end
-			if active_module
-				mydatastore = active_module.datastore
-			else
-				# if there is no module in use set the list to the global variable
-				mydatastore = self.framework.datastore
-			end
-
-			if rhosts.length > 5
-				# Lots of hosts makes 'show options' wrap which is difficult to
-				# read, store to a temp file
-				rhosts_file = Rex::Quickfile.new("msf-db-rhosts-")
-				mydatastore['RHOSTS'] = 'file:'+rhosts_file.path
-				# create the output file and assign it to the RHOSTS variable
-				rhosts_file.write(rhosts.join("\n")+"\n")
-				rhosts_file.close
-			else
-				# For short lists, just set it directly
-				mydatastore['RHOSTS'] = rhosts.join(" ")
-			end
-
-			print_line "RHOSTS => #{mydatastore['RHOSTS']}"
-			print_line
-		end
-
-
 		def db_find_tools(tools)
 			found   = true
 			missed  = []