github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(sftp): add suport for passphrase of private key (#6624 close #6592) 

Co-authored-by: XZB <i@1248.ink>
pull/6436/head
XZB-1248 2024-06-28 23:50:00 +08:00 committed by GitHub
parent 453d7da622
commit 227d034db8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/sftp/meta.go
View File

@ -10,6 +10,7 @@ type Addition struct {
Username string `json:"username" required:"true"` Username string `json:"username" required:"true"`
PrivateKey string `json:"private_key" type:"text"` PrivateKey string `json:"private_key" type:"text"`
Password string `json:"password"` Password string `json:"password"`
Passphrase string `json:"passphrase"`
driver.RootPath driver.RootPath
IgnoreSymlinkError bool `json:"ignore_symlink_error" default:"false" info:"Ignore symlink error"` IgnoreSymlinkError bool `json:"ignore_symlink_error" default:"false" info:"Ignore symlink error"`
} }

10
drivers/sftp/util.go
View File

@ -12,8 +12,14 @@ import (
func (d *SFTP) initClient() error { func (d *SFTP) initClient() error {
var auth ssh.AuthMethod var auth ssh.AuthMethod
if d.PrivateKey != "" { if len(d.PrivateKey) > 0 {
signer, err := ssh.ParsePrivateKey([]byte(d.PrivateKey)) var err error
var signer ssh.Signer
if len(d.Passphrase) > 0 {
signer, err = ssh.ParsePrivateKeyWithPassphrase([]byte(d.PrivateKey), []byte(d.Passphrase))
} else {
signer, err = ssh.ParsePrivateKey([]byte(d.PrivateKey))
}
if err != nil { if err != nil {
return err return err
} }