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

AlistGo#6592) Co-authored-by: XZB <[email protected]>
ForSourceCodeAnalysis · Aug 4, 2024 · bf51f4e · bf51f4e
1 parent fc0b404
commit bf51f4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/drivers/sftp/meta.go b/drivers/sftp/meta.go
@@ -10,6 +10,7 @@ type Addition struct {
 	Username   string `json:"username" required:"true"`
 	PrivateKey string `json:"private_key" type:"text"`
 	Password   string `json:"password"`
+	Passphrase string `json:"passphrase"`
 	driver.RootPath
 	IgnoreSymlinkError bool `json:"ignore_symlink_error" default:"false" info:"Ignore symlink error"`
 }

diff --git a/drivers/sftp/util.go b/drivers/sftp/util.go
@@ -12,8 +12,14 @@ import (
 
 func (d *SFTP) initClient() error {
 	var auth ssh.AuthMethod
-	if d.PrivateKey != "" {
-		signer, err := ssh.ParsePrivateKey([]byte(d.PrivateKey))
+	if len(d.PrivateKey) > 0 {
+		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 {
 			return err
 		}