KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

sftp: defer asking for user passwords until the SSH connection succeeds

Browse source 
Issue: 4660
    https://github.com/rclone/rclone/issues/4660

Unexpected side effect: a wrong password allows for the user to retry!
This commit is contained in:
Stephen Harris 2020-10-06 18:56:28 -04:00 committed by Nick Craig-Wood
parent e3a5bb9b48
commit 9e925becb6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
backend/sftp/sftp.go
View file

@ -563,16 +563,22 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
sshConfig.Auth = append(sshConfig.Auth, ssh.Password(clearpass)) sshConfig.Auth = append(sshConfig.Auth, ssh.Password(clearpass))
} }
// Ask for password if none was defined and we're allowed to // Config for password if none was defined and we're allowed to
// We don't ask now; we ask if the ssh connection succeeds
if opt.Pass == "" && opt.AskPassword { if opt.Pass == "" && opt.AskPassword {
_, _ = fmt.Fprint(os.Stderr, "Enter SFTP password: ") sshConfig.Auth = append(sshConfig.Auth, ssh.PasswordCallback(getPass))
clearpass := config.ReadPassword()
sshConfig.Auth = append(sshConfig.Auth, ssh.Password(clearpass))
} }
return NewFsWithConnection(ctx, name, root, m, opt, sshConfig) return NewFsWithConnection(ctx, name, root, m, opt, sshConfig)
} }
// If we're in password mode and ssh connection succeeds then this
// callback is called
func getPass() (string, error) {
_, _ = fmt.Fprint(os.Stderr, "Enter SFTP password: ")
return config.ReadPassword(), nil
}
// NewFsWithConnection creates a new Fs object from the name and root and an ssh.ClientConfig. It connects to // NewFsWithConnection creates a new Fs object from the name and root and an ssh.ClientConfig. It connects to
// the host specified in the ssh.ClientConfig // the host specified in the ssh.ClientConfig
func NewFsWithConnection(ctx context.Context, name string, root string, m configmap.Mapper, opt *Options, sshConfig *ssh.ClientConfig) (fs.Fs, error) { func NewFsWithConnection(ctx context.Context, name string, root string, m configmap.Mapper, opt *Options, sshConfig *ssh.ClientConfig) (fs.Fs, error) {