johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

ftp: fix SOCK proxy support - fixes #8892 (#8918)
Some checks failed
build / windows (push) Has been cancelled
Details
build / other_os (push) Has been cancelled
Details
build / mac_amd64 (push) Has been cancelled
Details
build / mac_arm64 (push) Has been cancelled
Details
build / linux (push) Has been cancelled
Details
build / go1.24 (push) Has been cancelled
Details
build / linux_386 (push) Has been cancelled
Details
build / lint (push) Has been cancelled
Details
build / android-all (push) Has been cancelled
Details
Build & Push Docker Images / Build Docker Image for linux/386 (push) Has been cancelled
Details
Build & Push Docker Images / Build Docker Image for linux/amd64 (push) Has been cancelled
Details
Build & Push Docker Images / Build Docker Image for linux/arm/v6 (push) Has been cancelled
Details
Build & Push Docker Images / Build Docker Image for linux/arm/v7 (push) Has been cancelled
Details
Build & Push Docker Images / Build Docker Image for linux/arm64 (push) Has been cancelled
Details
Build & Push Docker Images / Merge & Push Final Docker Image (push) Has been cancelled
Details

Browse Source
This commit is contained in:
dougal
2025-10-24 14:50:13 +01:00
committed by GitHub
parent 4f60f8915d
commit 51859af8d9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/ftp/ftp.go
View File

@@ -456,9 +456,7 @@ func (f *Fs) ftpConnection(ctx context.Context) (c *ftp.ServerConn, err error) {
} }
}() }()
baseDialer := fshttp.NewDialer(ctx) baseDialer := fshttp.NewDialer(ctx)
if f.opt.SocksProxy != "" { if f.opt.SocksProxy != "" || f.proxyURL != nil {
conn, err = proxy.SOCKS5Dial(network, address, f.opt.SocksProxy, baseDialer)
} else if f.proxyURL != nil {
// We need to make the onward connection to f.opt.Host. However the FTP // We need to make the onward connection to f.opt.Host. However the FTP
// library sets the host to the proxy IP after using EPSV or PASV so we need // library sets the host to the proxy IP after using EPSV or PASV so we need
// to correct that here. // to correct that here.
@@ -468,7 +466,11 @@ func (f *Fs) ftpConnection(ctx context.Context) (c *ftp.ServerConn, err error) {
return nil, err return nil, err
} }
dialAddress := net.JoinHostPort(f.opt.Host, dialPort) dialAddress := net.JoinHostPort(f.opt.Host, dialPort)
if f.opt.SocksProxy != "" {
conn, err = proxy.SOCKS5Dial(network, dialAddress, f.opt.SocksProxy, baseDialer)
} else {
conn, err = proxy.HTTPConnectDial(network, dialAddress, f.proxyURL, baseDialer) conn, err = proxy.HTTPConnectDial(network, dialAddress, f.proxyURL, baseDialer)
}
} else { } else {
conn, err = baseDialer.Dial(network, address) conn, err = baseDialer.Dial(network, address)
} }