Merge branch 'master' of https://github.com/rapid7/metasploit-framework

Author: jvazquez-r7

lib/msf/core/auxiliary/auth_brute.rb

@@ -22,6 +22,9 @@ def initialize(info = {})
 			OptBool.new('VERBOSE', [ true, "Whether to print output for all attempts", true]),
 			OptBool.new('BLANK_PASSWORDS', [ false, "Try blank passwords for all users", true]),
 			OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", true]),
+			OptBool.new('DB_ALL_CREDS', [false,"Try each user/password couple stored in the current database",true]),
+			OptBool.new('DB_ALL_USERS', [false,"Add all users in the current database to the list",false]),
+			OptBool.new('DB_ALL_PASS', [false,"Add all passwords in the current database to the list",false]),
 			OptBool.new('STOP_ON_SUCCESS', [ true, "Stop guessing when a credential works for a host", false]),
 		], Auxiliary::AuthBrute)
 
@@ -184,6 +187,23 @@ def build_credentials_array
 		if datastore['BLANK_PASSWORDS']
 			credentials = gen_blank_passwords(users, credentials)
 		end
+		if framework.db.active
+			if datastore['DB_ALL_CREDS']
+				myworkspace.creds.each do |o|
+					credentials << [o.user, o.pass] if o.ptype =~ /password/
+				end
+			end
+			if datastore['DB_ALL_USERS']
+				myworkspace.creds.each do |o|
+					users << o.user
+				end
+			end
+			if datastore['DB_ALL_PASS']
+				myworkspace.creds.each do |o|
+					passwords << o.pass if o.ptype =~ /password/
+				end
+			end
+		end
 		credentials.concat(combine_users_and_passwords(users, passwords))
 		credentials.uniq!
 		credentials = just_uniq_users(credentials) if @strip_passwords

lib/msf/core/db.rb

@@ -2980,10 +2980,10 @@ def import_filetype_detect(data)
 		elsif (firstline.index("<scanJob>"))
 			@import_filedata[:type] = "Retina XML"
 			return :retina_xml
-		elsif (firstline.index("<get_reports_response status=\"200\" status_text=\"OK\">"))
+		elsif (firstline.index(/<get_reports_response status=['"]200['"] status_text=['"]OK['"]>/))
 			@import_filedata[:type] = "OpenVAS XML"
 			return :openvas_new_xml
-		elsif (firstline.index("<report id=\""))
+		elsif (firstline.index(/<report id=['"]/))
 			@import_filedata[:type] = "OpenVAS XML"
 			return :openvas_new_xml
 		elsif (firstline.index("<NessusClientData>"))

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

@@ -1516,8 +1516,13 @@ def cmd_spool(*args)
 		# Restore color and prompt
 		driver.output.config[:color] = color
 		prompt = framework.datastore['Prompt'] || Msf::Ui::Console::Driver::DefaultPrompt
+		if active_module
+			# intentionally += and not << because we don't want to modify
+			# datastore or the constant DefaultPrompt
+			prompt += " #{active_module.type}(%bld%red#{active_module.shortname}%clr)"
+		end
 		prompt_char = framework.datastore['PromptChar'] || Msf::Ui::Console::Driver::DefaultPromptChar
-		driver.update_prompt("#{prompt} #{active_module.type}(%bld%red#{active_module.shortname}%clr) ", prompt_char, true)
+		driver.update_prompt("#{prompt} ", prompt_char, true)
 
 		print_status(msg)
 		return

lib/openvas/openvas-omp.rb

@@ -604,33 +604,36 @@ def report_get_by_id(report_id, format_id)
 			if not report
 				raise OMPError.new("Invalid report id.")
 			end
+
 			format = @formats[format_id.to_i]
 			if not format
 				raise OMPError.new("Invalid format id.")
 			end
-			req = xml_attrs("get_reports", {"report_id"=>report["id"], "format_id"=>format["id"]})
 
+			req = xml_attrs("get_reports", {"report_id"=>report["id"], "format_id"=>format["id"]})
 			begin
 				status, status_text, resp = omp_request_xml(req)
-				if status == "404"
-					raise OMPError.new(status_text)
-				end
-				content_type = resp.elements["report"].attributes["content_type"]
-				report = resp.elements["report"].text
-
-				if report == nil
-					raise OMPError.new("The report is empty.")
-				end
-
-				# XML reports are in XML format, everything else is base64 encoded.
-				if content_type == "text/xml"
-					return resp.elements["report"].text
-				else
-					return Base64.decode64(resp.elements["report"].text)
-				end
 			rescue
 				raise OMPResponseError
 			end
+
+			if status == "404"
+				raise OMPError.new(status_text)
+			end
+
+			content_type = resp.elements["report"].attributes["content_type"]
+			report = resp.elements["report"].to_s
+
+			if report == nil
+				raise OMPError.new("The report is empty.")
+			end
+
+			# XML reports are in XML format, everything else is base64 encoded.
+			if content_type == "text/xml"
+				return report
+			else
+				return Base64.decode64(report)
+			end
 		end
 
     end