Land rapid7#1973, @wchen-r7's fix to handle ftp auth correctly

jvazquez-r7 · jvazquez-r7 · commit aa134b0bccd1 · 2013-06-18T09:34:55.000-05:00
diff --git a/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb b/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb
@@ -54,7 +54,8 @@ def initialize
 
 	def run_host(ip)
 
-		connect_login
+		c = connect_login
+		return if not c
 
 		path = datastore['TRAVERSAL'] + datastore['PATH']
 
diff --git a/modules/exploits/windows/ftp/ability_server_stor.rb b/modules/exploits/windows/ftp/ability_server_stor.rb
@@ -91,7 +91,8 @@ def check
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		myhost = datastore['LHOST'] == '0.0.0.0' ? Rex::Socket.source_address : datastore['LHOST']
 
diff --git a/modules/exploits/windows/ftp/cesarftp_mkd.rb b/modules/exploits/windows/ftp/cesarftp_mkd.rb
@@ -70,7 +70,8 @@ def check
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		sploit =  "\n" * 671 + rand_text_english(3, payload_badchars)
 		sploit << [target.ret].pack('V') + make_nops(40) + payload.encoded
diff --git a/modules/exploits/windows/ftp/filecopa_list_overflow.rb b/modules/exploits/windows/ftp/filecopa_list_overflow.rb
@@ -47,7 +47,8 @@ def initialize(info = {})
 
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/ftp/globalscapeftp_input.rb b/modules/exploits/windows/ftp/globalscapeftp_input.rb
@@ -51,7 +51,8 @@ def initialize(info = {})
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		buf           = make_nops(3047)
 		buf[2043, 4]  = [ target.ret ].pack('V')
diff --git a/modules/exploits/windows/ftp/httpdx_tolog_format.rb b/modules/exploits/windows/ftp/httpdx_tolog_format.rb
@@ -173,7 +173,8 @@ def exploit
 		end
 
 		# proceed with chosen target...
-		connect_login
+		c = connect_login
+		return if not c
 
 		# '<ip>\n PWD '
 		ip_length = Rex::Socket.source_address(datastore['RHOST']).length
diff --git a/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb b/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb
@@ -76,7 +76,8 @@ def check
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/ftp/servu_chmod.rb b/modules/exploits/windows/ftp/servu_chmod.rb
@@ -67,7 +67,8 @@ def check
 
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		eggoptions =
 		{
diff --git a/modules/exploits/windows/ftp/servu_mdtm.rb b/modules/exploits/windows/ftp/servu_mdtm.rb
@@ -129,8 +129,8 @@ def check
 	end
 
 	def exploit
-
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/ftp/slimftpd_list_concat.rb b/modules/exploits/windows/ftp/slimftpd_list_concat.rb
@@ -52,7 +52,8 @@ def initialize(info = {})
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/ftp/turboftp_port.rb b/modules/exploits/windows/ftp/turboftp_port.rb
@@ -145,7 +145,8 @@ def exploit
 		end
 
 		print_status("Selected Target: #{my_target.name}")
-		connect_login
+		c = connect_login
+		return if not c
 
 		rop_chain = create_rop_chain(target['ver'])
 		rop = rop_chain.unpack('C*').join(',')
diff --git a/modules/exploits/windows/ftp/wftpd_size.rb b/modules/exploits/windows/ftp/wftpd_size.rb
@@ -50,7 +50,8 @@ def initialize(info = {})
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		sploit =  "/" + make_nops(525 - payload.encoded.length)
 		sploit << payload.encoded + [target.ret].pack('V')
diff --git a/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb b/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb
@@ -62,7 +62,8 @@ def check
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb b/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb
@@ -56,7 +56,8 @@ def check
 	end
 
 	def exploit
-		connect_login
+		c = connect_login
+		return if not c
 
 		print_status("Trying target #{target.name}...")
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ def check`
`67`	`67`
`68`	`68`
`69`	`69`	`def exploit`
`70`		`- connect_login`
	`70`	`+ c = connect_login`
	`71`	`+ return if not c`
`71`	`72`
`72`	`73`	`eggoptions =`
`73`	`74`	`{`