extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-08-17 09:01:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

ftp,sftp: add socks_proxy support for SOCKS5 proxies

Browse Source 
Fixes #3558
This commit is contained in:
Zach
2023-07-29 22:02:08 -04:00
committed by GitHub
parent f4449440f8
commit 347812d1d3
4 changed files with 86 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/sftp/ssh_internal.go
View File

@ -6,9 +6,11 @@ package sftp
import (
"context"
"io"
"net"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/fshttp"
"github.com/rclone/rclone/lib/proxy"
"golang.org/x/crypto/ssh"
)
@ -22,8 +24,17 @@ type sshClientInternal struct {
// convenience function that connects to the given network address,
// initiates the SSH handshake, and then sets up a Client.
func (f *Fs) newSSHClientInternal(ctx context.Context, network, addr string, sshConfig *ssh.ClientConfig) (sshClient, error) {
dialer := fshttp.NewDialer(ctx)
conn, err := dialer.Dial(network, addr)
baseDialer := fshttp.NewDialer(ctx)
var (
conn net.Conn
err error
)
if f.opt.SocksProxy != "" {
conn, err = proxy.SOCKS5Dial(network, addr, f.opt.SocksProxy, baseDialer)
} else {
conn, err = baseDialer.Dial(network, addr)
}
if err != nil {
return nil, err
}