Skip to content

Add proxy support for sftpstorage #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryancdotorg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add proxy support for sftpstorage #623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/duplicacy_sftpstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,30 @@ import (

"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
"golang.org/x/net/proxy"
"github.com/magisterquis/connectproxy"
)

var registerDialerTypes sync.Once;
func proxyableDial(network, addr string, config *ssh.ClientConfig) (*ssh.Client, error) {
registerDialerTypes.Do(func() {
proxy.RegisterDialerType("http", connectproxy.New)
proxy.RegisterDialerType("https", connectproxy.New)
})

conn, err := proxy.FromEnvironment().Dial(network, addr)
if err != nil {
return nil, err
}

c, chans, reqs, err := ssh.NewClientConn(conn, addr, config)
if err != nil {
return nil, err
}

return ssh.NewClient(c, chans, reqs), nil
}

type SFTPStorage struct {
StorageBase

Expand Down Expand Up @@ -75,7 +97,7 @@ func CreateSFTPStorage(compatibilityMode bool, server string, port int, username
}

serverAddress := fmt.Sprintf("%s:%d", server, port)
connection, err := ssh.Dial("tcp", serverAddress, sftpConfig)
connection, err := proxyableDial("tcp", serverAddress, sftpConfig)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -142,7 +164,7 @@ func (storage *SFTPStorage) retry(f func () error) error {
delay *= 2

storage.clientLock.Lock()
connection, err := ssh.Dial("tcp", storage.serverAddress, storage.sftpConfig)
connection, err := proxyableDial("tcp", storage.serverAddress, storage.sftpConfig)
if err != nil {
LOG_WARN("SFT_RECONNECT", "Failed to connect to %s: %v; retrying", storage.serverAddress, err)
storage.clientLock.Unlock()
Expand Down