TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

sftp: perform environment variable expansion on key-file

Browse source
This commit is contained in:
Fabian Möller 2019-01-03 13:42:13 +01:00
parent 0458b961c5
commit 1433558c01
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
backend/sftp/sftp.go
View file

@ -315,6 +315,18 @@ func (f *Fs) putSftpConnection(pc **conn, err error) {
f.poolMu.Unlock() f.poolMu.Unlock()
} }
// shellExpand replaces a leading "~" with "${HOME}" and expands all environment
// variables afterwards.
func shellExpand(s string) string {
if s != "" {
if s[0] == '~' {
s = "${HOME}" + s[1:]
}
s = os.ExpandEnv(s)
}
return s
}
// NewFs creates a new Fs object from the name and root. It connects to // NewFs creates a new Fs object from the name and root. It connects to
// the host specified in the config file. // the host specified in the config file.
func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) { func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
@ -342,8 +354,9 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
sshConfig.Config.Ciphers = append(sshConfig.Config.Ciphers, "aes128-cbc") sshConfig.Config.Ciphers = append(sshConfig.Config.Ciphers, "aes128-cbc")
} }
keyFile := shellExpand(opt.KeyFile)
// Add ssh agent-auth if no password or file specified // Add ssh agent-auth if no password or file specified
if (opt.Pass == "" && opt.KeyFile == "") || opt.KeyUseAgent { if (opt.Pass == "" && keyFile == "") || opt.KeyUseAgent {
sshAgentClient, _, err := sshagent.New() sshAgentClient, _, err := sshagent.New()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "couldn't connect to ssh-agent") return nil, errors.Wrap(err, "couldn't connect to ssh-agent")
@ -352,8 +365,8 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "couldn't read ssh agent signers") return nil, errors.Wrap(err, "couldn't read ssh agent signers")
} }
if opt.KeyFile != "" { if keyFile != "" {
pubBytes, err := ioutil.ReadFile(opt.KeyFile + ".pub") pubBytes, err := ioutil.ReadFile(keyFile + ".pub")
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to read public key file") return nil, errors.Wrap(err, "failed to read public key file")
} }
@ -379,8 +392,8 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
} }
// Load key file if specified // Load key file if specified
if opt.KeyFile != "" { if keyFile != "" {
key, err := ioutil.ReadFile(opt.KeyFile) key, err := ioutil.ReadFile(keyFile)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to read private key file") return nil, errors.Wrap(err, "failed to read private key file")
} }