Skip to content

SSH connections are left dangling after use #668

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

Merged
m90 merged 1 commit into from
Nov 9, 2025
Merged

SSH connections are left dangling after use #668

Show file tree
Hide file tree
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
12 changes: 11 additions & 1 deletion cmd/backup/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,20 @@ func (s *script) init() error {
IdentityPassphrase: s.c.SSHIdentityPassphrase,
RemotePath: s.c.SSHRemotePath,
}
sshBackend, err := ssh.NewStorageBackend(sshConfig, logFunc)

sshBackend, closeSSHConnection, err := ssh.NewStorageBackend(sshConfig, logFunc)

s.registerHook(hookLevelPlumbing, func(err error) error {
if err := closeSSHConnection(); err != nil {
return errwrap.Wrap(err, "failed to close ssh connection")
}
return nil
})

if err != nil {
return errwrap.Wrap(err, "error creating ssh storage backend")
}

s.storages = append(s.storages, sshBackend)
}

Expand Down
21 changes: 11 additions & 10 deletions internal/storage/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ type Config struct {
RemotePath string
}

var noop = func() error { return nil }

// NewStorageBackend creates and initializes a new SSH storage backend.
func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error) {
func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, func() error, error) {
var authMethods []ssh.AuthMethod

if opts.Password != "" {
Expand All @@ -47,20 +49,20 @@ func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error
if _, err := os.Stat(opts.IdentityFile); err == nil {
key, err := os.ReadFile(opts.IdentityFile)
if err != nil {
return nil, errwrap.Wrap(nil, "error reading the private key")
return nil, noop, errwrap.Wrap(nil, "error reading the private key")
}

var signer ssh.Signer
if opts.IdentityPassphrase != "" {
signer, err = ssh.ParsePrivateKeyWithPassphrase(key, []byte(opts.IdentityPassphrase))
if err != nil {
return nil, errwrap.Wrap(nil, "error parsing the encrypted private key")
return nil, noop, errwrap.Wrap(nil, "error parsing the encrypted private key")
}
authMethods = append(authMethods, ssh.PublicKeys(signer))
} else {
signer, err = ssh.ParsePrivateKey(key)
if err != nil {
return nil, errwrap.Wrap(nil, "error parsing the private key")
return nil, noop, errwrap.Wrap(nil, "error parsing the private key")
}
authMethods = append(authMethods, ssh.PublicKeys(signer))
}
Expand All @@ -72,13 +74,12 @@ func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
}
sshClient, err := ssh.Dial("tcp", fmt.Sprintf("%s:%s", opts.HostName, opts.Port), sshClientConfig)

if err != nil {
return nil, errwrap.Wrap(err, "error creating ssh client")
if err != nil || sshClient == nil {
return nil, noop, errwrap.Wrap(err, "error creating ssh client")
}
_, _, err = sshClient.SendRequest("keepalive", false, nil)
if err != nil {
return nil, err
return nil, sshClient.Close, err
}

sftpClient, err := sftp.NewClient(sshClient,
Expand All @@ -87,7 +88,7 @@ func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error
sftp.MaxConcurrentRequestsPerFile(64),
)
if err != nil {
return nil, errwrap.Wrap(err, "error creating sftp client")
return nil, sshClient.Close, errwrap.Wrap(err, "error creating sftp client")
}

return &sshStorage{
Expand All @@ -98,7 +99,7 @@ func NewStorageBackend(opts Config, logFunc storage.Log) (storage.Backend, error
client: sshClient,
sftpClient: sftpClient,
hostName: opts.HostName,
}, nil
}, sshClient.Close, nil
}

// Name returns the name of the storage backend
Expand Down