Merge pull request rapid7#1118 from rapid7/bugs/rm7553-uncached-modules-search

bturner-r7 · bturner-r7 · commit 1ce1cdf7a090 · 2012-12-01T13:59:16.000-08:00
Bugs/rm7553 uncached modules search
diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -1335,10 +1335,13 @@ def cmd_search(*args)
 		}
 
 		if framework.db and framework.db.migrated and framework.db.modules_cached
-			return search_modules_sql(match)
+			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.")
 		end
 
-		print_error("Warning: database not connected or cache not built, falling back to slow search")
+		print_warning("Falling back to slow search.")
 
 		tbl = generate_module_table("Matching Modules")
 		[

Original file line number	Diff line number	Diff line change
`@@ -1335,10 +1335,13 @@ def cmd_search(*args)`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`	`1337`	`if framework.db and framework.db.migrated and framework.db.modules_cached`
`1338`		`- return search_modules_sql(match)`
	`1338`	`+ sql_results = search_modules_sql(match)`
	`1339`	`+ return sql_results if sql_results # Patches around #7553`
	`1340`	`+ else`
	`1341`	`+ print_warning("Database not connected or cache not built.")`
`1339`	`1342`	`end`
`1340`	`1343`
`1341`		`- print_error("Warning: database not connected or cache not built, falling back to slow search")`
	`1344`	`+ print_warning("Falling back to slow search.")`
`1342`	`1345`
`1343`	`1346`	`tbl = generate_module_table("Matching Modules")`
`1344`	`1347`	`[`