try interactive at last (#3886)

juicedata · Aug 31, 2023 · 41aaa92 · 41aaa92
1 parent fff2454
commit 41aaa92
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/object/sftp.go b/pkg/object/sftp.go
@@ -419,7 +419,7 @@ func (f *sftpStore) ListAll(prefix, marker string) (<-chan Object, error) {
 	return listed, nil
 }
 
-func SshInteractive(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
+func sshInteractive(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
 	if len(questions) == 0 {
 		fmt.Print(user, instruction)
 	} else {
@@ -476,10 +476,7 @@ func newSftp(endpoint, username, pass, token string) (ObjectStorage, error) {
 	username = unescape(username)
 	var auth []ssh.AuthMethod
 	if pass != "" {
-		pass = unescape(pass)
-		auth = append(auth, ssh.Password(pass))
-	} else {
-		auth = append(auth, ssh.KeyboardInteractive(SshInteractive))
+		auth = append(auth, ssh.Password(unescape(pass)))
 	}
 
 	var signers []ssh.Signer
@@ -530,6 +527,10 @@ func newSftp(endpoint, username, pass, token string) (ObjectStorage, error) {
 		auth = append(auth, ssh.PublicKeys(signers...))
 	}
 
+	if pass == "" {
+		auth = append(auth, ssh.KeyboardInteractive(sshInteractive))
+	}
+
 	config := &ssh.ClientConfig{
 		User:            username,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),