diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 261dd65..a61dfd6 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -404,8 +404,9 @@ def connect(host, port = FTP_PORT) synchronize do @host = host @bare_sock = open_socket(host, port) - if @ssl_context - begin + succeeded = false + begin + if @ssl_context unless @implicit_ftps set_socket(BufferedSocket.new(@bare_sock, read_timeout: @read_timeout)) voidcmd("AUTH TLS") @@ -415,12 +416,12 @@ def connect(host, port = FTP_PORT) voidcmd("PBSZ 0") voidcmd("PROT P") end - rescue OpenSSL::SSL::SSLError, OpenTimeout - @sock.close - raise + else + set_socket(BufferedSocket.new(@bare_sock, read_timeout: @read_timeout)) end - else - set_socket(BufferedSocket.new(@bare_sock, read_timeout: @read_timeout)) + succeeded = true + ensure + @bare_sock.close if !succeeded end end end diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index 34e11d0..5e3600a 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -64,6 +64,7 @@ def test_connect_fail begin ftp = Net::FTP.new assert_raise(Net::FTPTempError){ ftp.connect(SERVER_ADDR, server.port) } + assert_predicate(ftp.instance_variable_get(:@bare_sock), :closed?) ensure ftp.close if ftp server.close @@ -1876,6 +1877,35 @@ def test_tls_post_connection_check end end + def test_tls_auth_fail + server = create_ftp_server { |sock| + sock.print("220 (test_ftp).\r\n") + sock.gets + sock.print("502 Command not implemented.\r\n") + } + begin + ftp = Net::FTP.new(nil, ssl: true) + assert_raise(Net::FTPPermError) { ftp.connect(SERVER_ADDR, server.port) } + assert_predicate(ftp.instance_variable_get(:@bare_sock), :closed?) + ensure + ftp.close if ftp + server.close + end + end + + def test_implicit_ftps_handshake_fail + server = TCPServer.new(SERVER_ADDR, 0) + @thread = Thread.start { server.accept.tap { |s| s.print("220 (test_ftp).\r\n") } } + begin + ftp = Net::FTP.new(nil, ssl: true, implicit_ftps: true) + assert_raise(OpenSSL::SSL::SSLError) { ftp.connect(SERVER_ADDR, server.addr[1]) } + assert_predicate(ftp.instance_variable_get(:@bare_sock), :closed?) + ensure + @thread.value.close + server.close + end + end + def test_active_private_data_connection server = TCPServer.new(SERVER_ADDR, 0) port = server.addr[1]