"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
ftp: discard connections that fail with non-FTP errors - fixes #10102
Daniel Baeebfaae73c9a7
diff --git a/backend/ftp/ftp.go b/backend/ftp/ftp.goindex 7dcbdeb62..6e64ae380 100644--- a/backend/ftp/ftp.go+++ b/backend/ftp/ftp.go@@ -584,8 +584,9 @@ func (f *Fs) getFtpConnection(ctx context.Context) (c *ftp.ServerConn, err error//// It nils the pointed to connection out so it can't be reused//-// if err is not nil then it checks the connection is alive using a-// NOOP request+// if err is not nil then it discards the connection unless the error+// carries an FTP reply code, in which case it checks the connection+// is alive using a NOOP requestfunc (f *Fs) putFtpConnection(pc **ftp.ServerConn, err error) {if f.opt.Concurrency > 0 {defer f.tokens.Put()@@ -599,14 +600,17 @@ func (f *Fs) putFtpConnection(pc **ftp.ServerConn, err error) {}*pc = nilif err != nil {- // If not a regular FTP error code then check the connection- if tpErr := textprotoError(err); tpErr != nil {- nopErr := c.NoOp()- if nopErr != nil {- fs.Debugf(f, "Connection failed, closing: %v", nopErr)- _ = c.Quit()- return- }+ // An error without an FTP reply code means the control+ // connection can no longer be trusted, so discard it.+ if textprotoError(err) == nil {+ fs.Debugf(f, "Discarding connection after non-FTP error: %v", err)+ _ = c.Quit()+ return+ }+ if nopErr := c.NoOp(); nopErr != nil {+ fs.Debugf(f, "Connection failed, closing: %v", nopErr)+ _ = c.Quit()+ return}}f.poolMu.Lock()diff --git a/backend/ftp/ftp_internal_test.go b/backend/ftp/ftp_internal_test.goindex 4554ac02b..97f30bb62 100644--- a/backend/ftp/ftp_internal_test.go+++ b/backend/ftp/ftp_internal_test.go@@ -1,12 +1,18 @@package ftpimport (+ "bufio""context"+ "errors""fmt"+ "net"+ "net/textproto""strings"+ "sync""testing""time"+ "github.com/jlaffaye/ftp""github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/configmap""github.com/rclone/rclone/fs/object"@@ -144,3 +150,97 @@ func (f *Fs) InternalTest(t *testing.T) {}var _ fstests.InternalTester = (*Fs)(nil)++// fakeFTPServer is a minimal FTP control-connection server which answers+// every command with 200 OK.+type fakeFTPServer struct {+ ln net.Listener+ mu sync.Mutex+ conn net.Conn+}++func startFakeFTPServer(t *testing.T) *fakeFTPServer {+ t.Helper()+ ln, err := net.Listen("tcp", "127.0.0.1:0")+ require.NoError(t, err)+ s := &fakeFTPServer{ln: ln}+ go s.serve()+ t.Cleanup(func() { s.close() })+ return s+}++func (s *fakeFTPServer) serve() {+ conn, err := s.ln.Accept()+ if err != nil {+ return+ }+ s.mu.Lock()+ s.conn = conn+ s.mu.Unlock()+ defer func() { _ = conn.Close() }()+ _, _ = fmt.Fprint(conn, "220 fake FTP server\r\n")+ scanner := bufio.NewScanner(conn)+ for scanner.Scan() {+ _, _ = fmt.Fprint(conn, "200 OK\r\n")+ }+}++// killConnection closes the server side of the control connection,+// simulating a server that dropped an idle connection.+func (s *fakeFTPServer) killConnection() {+ s.mu.Lock()+ defer s.mu.Unlock()+ if s.conn != nil {+ _ = s.conn.Close()+ }+}++func (s *fakeFTPServer) close() {+ s.mu.Lock()+ defer s.mu.Unlock()+ if s.conn != nil {+ _ = s.conn.Close()+ }+ _ = s.ln.Close()+}++// TestPutFtpConnectionDiscardsDeadConnection checks that a connection+// returned with a raw network error is closed and never re-pooled, while+// a connection returned with a plain FTP reply-code error is probed with+// NOOP and pooled while the probe succeeds.+func TestPutFtpConnectionDiscardsDeadConnection(t *testing.T) {+ t.Run("network error discards", func(t *testing.T) {+ server := startFakeFTPServer(t)+ c, err := ftp.Dial(server.ln.Addr().String())+ require.NoError(t, err)+ f := &Fs{opt: Options{}}+ f.putFtpConnection(&c, errors.New("unexpected EOF"))+ assert.Nil(t, c)+ assert.Empty(t, f.pool)+ })++ t.Run("FTP reply error with live connection pools", func(t *testing.T) {+ server := startFakeFTPServer(t)+ c, err := ftp.Dial(server.ln.Addr().String())+ require.NoError(t, err)+ f := &Fs{opt: Options{}}+ f.putFtpConnection(&c, &textproto.Error{Code: 550, Msg: "not found"})+ assert.Nil(t, c)+ require.Len(t, f.pool, 1)+ assert.NoError(t, f.pool[0].NoOp())+ _ = f.pool[0].Quit()+ })++ t.Run("FTP reply error with dead connection discards", func(t *testing.T) {+ server := startFakeFTPServer(t)+ c, err := ftp.Dial(server.ln.Addr().String())+ require.NoError(t, err)+ server.killConnection()+ // Let the FIN propagate so the NOOP probe observes the dead connection.+ time.Sleep(100 * time.Millisecond)+ f := &Fs{opt: Options{}}+ f.putFtpConnection(&c, &textproto.Error{Code: 550, Msg: "not found"})+ assert.Nil(t, c)+ assert.Empty(t, f.pool)+ })+}