Merge pull request rapid7#1119 from bug/fix-module-search

[FIXRM rapid7#7561]
[SEERM rapid7#7553]

Author: bturner-r7

lib/msf/core/db_manager.rb

@@ -196,7 +196,7 @@ def connect(opts={})
 
 		# Prefer the config file's pool setting
 		nopts['pool'] ||= 75
-		
+
 		# Prefer the config file's wait_timeout setting too
 		nopts['wait_timeout'] ||= 300
 
@@ -342,11 +342,13 @@ def update_all_module_details
 		return if not self.migrated
 		return if self.modules_caching
 
+		self.framework.cache_thread = Thread.current
+
 		self.modules_cached  = false
 		self.modules_caching = true
 
 		::ActiveRecord::Base.connection_pool.with_connection {
-		
+
 		refresh = []
 		skipped = []
 
@@ -394,6 +396,9 @@ def update_all_module_details
 			end
 		end
 
+		self.framework.cache_initialized = true
+		self.framework.cache_thread = nil
+
 		self.modules_cached  = true
 		self.modules_caching = false
 
@@ -460,16 +465,16 @@ def module_to_details_hash(m)
 
 		res[:description] = m.description.to_s.strip
 
-		m.arch.map{ |x| 
-			bits << [ :arch, { :name => x.to_s } ] 
+		m.arch.map{ |x|
+			bits << [ :arch, { :name => x.to_s } ]
 		}
 
-		m.platform.platforms.map{ |x| 
-			bits << [ :platform, { :name => x.to_s.split('::').last.downcase } ] 
+		m.platform.platforms.map{ |x|
+			bits << [ :platform, { :name => x.to_s.split('::').last.downcase } ]
 		}
 
-		m.author.map{|x| 
-			bits << [ :author, { :name => x.to_s } ] 
+		m.author.map{|x|
+			bits << [ :author, { :name => x.to_s } ]
 		}
 
 		m.references.map do |r|
@@ -500,14 +505,14 @@ def module_to_details_hash(m)
 			# Some modules are a combination, which means they are actually aggressive
 			res[:stance] = m.stance.to_s.index("aggressive") ? "aggressive" : "passive"
 
-			
+
 			m.class.mixins.each do |x|
 			 	bits << [ :mixin, { :name => x.to_s } ]
 			end
 		end
 
 		if(m.type == "auxiliary")
-	
+
 			m.actions.each_index do |i|
 				bits << [ :action, { :name => m.actions[i].name.to_s } ]
 			end
@@ -523,9 +528,9 @@ def module_to_details_hash(m)
 
 		res
 	end
-	
-	
-	
+
+
+
 	#
 	# This provides a standard set of search filters for every module.
 	# The search terms are in the form of:
@@ -562,7 +567,7 @@ def search_modules(search_string, inclusive=false)
 		end
 
 		::ActiveRecord::Base.connection_pool.with_connection {
-	
+
 		where_q = []
 		where_v = []
 
@@ -572,12 +577,12 @@ def search_modules(search_string, inclusive=false)
 				case kt
 				when 'text'
 					xv = "%#{kv}%"
-					where_q << ' ( ' + 
+					where_q << ' ( ' +
 						'module_details.fullname ILIKE ? OR module_details.name ILIKE ? OR module_details.description ILIKE ? OR ' +
 						'module_authors.name ILIKE ? OR module_actions.name ILIKE ? OR module_archs.name ILIKE ? OR ' +
-						'module_targets.name ILIKE ? OR module_platforms.name ILIKE ? ' +
+						'module_targets.name ILIKE ? OR module_platforms.name ILIKE ? OR module_refs.name ILIKE ?' +
 						') '
-					where_v << [ xv, xv, xv, xv, xv, xv, xv, xv ]
+					where_v << [ xv, xv, xv, xv, xv, xv, xv, xv, xv ]
 				when 'name'
 					xv = "%#{kv}%"
 					where_q << ' ( module_details.fullname ILIKE ? OR module_details.name ILIKE ? ) '
@@ -594,7 +599,7 @@ def search_modules(search_string, inclusive=false)
 					# TODO
 				when 'type'
 					where_q << ' ( module_details.mtype = ? ) '
-					where_v << [ kv ]				
+					where_v << [ kv ]
 				when 'app'
 					where_q << ' ( module_details.stance = ? )'
 					where_v << [ ( kv == "client") ? "passive" : "active"  ]
@@ -604,11 +609,11 @@ def search_modules(search_string, inclusive=false)
 				when 'cve','bid','osvdb','edb'
 					where_q << ' ( module_refs.name = ? )'
 					where_v << [ kt.upcase + '-' + kv ]
-	
+
 				end
 			end
 		end
-		
+
 		qry = Mdm::ModuleDetail.select("DISTINCT(module_details.*)").
 			joins(
 				"LEFT OUTER JOIN module_authors   ON module_details.id = module_authors.module_detail_id " +
@@ -629,4 +634,3 @@ def search_modules(search_string, inclusive=false)
 
 end
 end
-

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

@@ -1335,13 +1335,11 @@ def cmd_search(*args)
 		}
 
 		if framework.db and framework.db.migrated and framework.db.modules_cached
-			sql_results = search_modules_sql(match)
-			return sql_results if sql_results # Patches around #7553
-		else
-			print_warning("Database not connected or cache not built.")
+			search_modules_sql(match)
+			return
 		end
 
-		print_warning("Falling back to slow search.")
+		print_warning("Database not connected or cache not built, using slow search")
 
 		tbl = generate_module_table("Matching Modules")
 		[

lib/msf/ui/console/driver.rb

@@ -228,10 +228,7 @@ def initialize(prompt = DefaultPrompt, prompt_char = DefaultPromptChar, opts = {
 
 			# Rebuild the module cache in a background thread
 			self.framework.threads.spawn("ModuleCacheRebuild", true) do
-				self.framework.cache_thread = Thread.current
 				self.framework.modules.refresh_cache_from_module_files
-				self.framework.cache_initialized = true
-				self.framework.cache_thread = nil
 			end
 		end