From 3fcd73e952aac756502635d624ee6e6f9bbefaeb Mon Sep 17 00:00:00 2001
From: windvalley <i@sre.im>
Date: Fri, 14 Jan 2022 12:03:30 +0800
Subject: [PATCH] refactor: optimize password prompt

Password prompt for login user changed from 'Password' to 'Password for zhangsan'.
---
 internal/pkg/sshtask/sshtask.go | 38 +++++++++++++++++++--------------
 pkg/batchssh/batchssh.go        |  4 ----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/internal/pkg/sshtask/sshtask.go b/internal/pkg/sshtask/sshtask.go
index bc11f94..38832a8 100644
--- a/internal/pkg/sshtask/sshtask.go
+++ b/internal/pkg/sshtask/sshtask.go
@@ -230,6 +230,8 @@ func (t *Task) BatchRun() {
 		util.CheckErr(err)
 	}
 
+	log.Debugf("got target hosts, count: %d", len(allHosts))
+
 	if t.configFlags.Hosts.List {
 		hostsCount := len(allHosts)
 		fmt.Printf("%s\n", strings.Join(allHosts, "\n"))
@@ -237,6 +239,15 @@ func (t *Task) BatchRun() {
 		return
 	}
 
+	authConf := t.configFlags.Auth
+	runConf := t.configFlags.Run
+
+	log.Debugf("Auth: login user: %s", authConf.User)
+
+	if runConf.Sudo {
+		log.Debugf("Auth: use sudo as user '%s'", runConf.AsUser)
+	}
+
 	switch t.taskType {
 	case CommandTask:
 		if t.command == "" {
@@ -445,8 +456,6 @@ func (t *Task) getSSHAuthMethods(password *string) []ssh.AuthMethod {
 	)
 
 	if *password != "" {
-		log.Debugf("Auth: received password of the login user")
-
 		auths = append(auths, ssh.Password(*password))
 	} else {
 		log.Debugf("Auth: password of the login user not provided")
@@ -479,7 +488,7 @@ func (t *Task) getSSHAuthMethods(password *string) []ssh.AuthMethod {
 	if len(auths) == 0 {
 		log.Debugf("Auth: no valid authentication method detected. Prompt for password of the login user")
 
-		*password = getPasswordFromPrompt()
+		*password = getPasswordFromPrompt(t.configFlags.Auth.User)
 		auths = append(auths, ssh.Password(*password))
 
 		return auths
@@ -488,7 +497,7 @@ func (t *Task) getSSHAuthMethods(password *string) []ssh.AuthMethod {
 	if *password == "" && t.configFlags.Run.Sudo {
 		log.Debugf("Auth: using sudo as other user needs password. Prompt for password of the login user")
 
-		*password = getPasswordFromPrompt()
+		*password = getPasswordFromPrompt(t.configFlags.Auth.User)
 		auths = append(auths, ssh.Password(*password))
 	}
 
@@ -502,15 +511,14 @@ func (t *Task) getProxySSHAuthMethods(password *string) []ssh.AuthMethod {
 		err        error
 	)
 
-	if t.configFlags.Proxy.Password != "" {
-		log.Debugf("Proxy Auth: received password of the proxy user")
+	log.Debugf("Proxy Auth: proxy login user: %s", t.configFlags.Proxy.User)
 
+	if t.configFlags.Proxy.Password != "" {
 		proxyAuths = append(proxyAuths, ssh.Password(t.configFlags.Proxy.Password))
 	} else {
-		log.Debugf("Proxy Auth: received password of the proxy user")
-
 		proxyAuths = append(proxyAuths, ssh.Password(*password))
 	}
+	log.Debugf("Proxy Auth: received password of the proxy user")
 
 	proxyKeyfiles := t.getProxyItentityFiles()
 	if len(proxyKeyfiles) != 0 {
@@ -552,23 +560,21 @@ func (t *Task) getPassword() (password string, err error) {
 
 		password = strings.TrimSpace(string(passwordContent))
 
-		log.Debugf("read password from file '%s'", authFile)
+		log.Debugf("Auth: read password from file '%s'", authFile)
 	}
 
 	passwordFromFlag := t.configFlags.Auth.Password
 	if passwordFromFlag != "" {
 		password = passwordFromFlag
 
-		log.Debugf("read password from commandline flag or configuration file")
+		log.Debugf("Auth: received password from commandline flag or configuration file")
 	}
 
 	assignRealPass(&password)
 
 	if t.configFlags.Auth.AskPass {
 		log.Debugf("Auth: ask for password of login user by flag '-k/--auth.ask-pass'")
-		password = getPasswordFromPrompt()
-
-		log.Debugf("read password from terminal prompt")
+		password = getPasswordFromPrompt(t.configFlags.Auth.User)
 	}
 
 	//nolint:nakedret
@@ -652,8 +658,8 @@ func getSigner(keyfile, passphrase string) (ssh.Signer, string) {
 	return pubkey, fmt.Sprintf("parsed identity file '%s'", keyfile)
 }
 
-func getPasswordFromPrompt() string {
-	fmt.Fprintf(os.Stderr, "Password: ")
+func getPasswordFromPrompt(loginUser string) string {
+	fmt.Fprintf(os.Stderr, "Password for %s: ", loginUser)
 
 	var passwordByte []byte
 	passwordByte, err := term.ReadPassword(0)
@@ -666,7 +672,7 @@ func getPasswordFromPrompt() string {
 
 	fmt.Println("")
 
-	log.Debugf("Auth: read password of the login user from terminal prompt")
+	log.Debugf("Auth: received password of the login user '%s' from terminal prompt", loginUser)
 
 	return password
 }
diff --git a/pkg/batchssh/batchssh.go b/pkg/batchssh/batchssh.go
index 6b1bb2b..453f61b 100644
--- a/pkg/batchssh/batchssh.go
+++ b/pkg/batchssh/batchssh.go
@@ -88,8 +88,6 @@ func NewClient(
 	auths []ssh.AuthMethod,
 	options ...func(*Client),
 ) (*Client, error) {
-	log.Debugf("Login user: %s", user)
-
 	client := Client{
 		User:           user,
 		Password:       password,
@@ -814,8 +812,6 @@ func WithConcurrency(count int) func(*Client) {
 // WithProxyServer connect remote hosts by proxy server.
 func WithProxyServer(proxyServer, user string, port int, auths []ssh.AuthMethod) func(*Client) {
 	return func(c *Client) {
-		log.Debugf("Proxy login user: %s", user)
-
 		proxySSHConfig := &ssh.ClientConfig{
 			User:    user,
 			Auth:    auths,