Write password prompts to stderr to avoid co-mingling stdout (#3781) (#…

…3782)
hashicorp · Jan 18, 2018 · 4ddd1f2 · 4ddd1f2
1 parent 8bbece9
commit 4ddd1f2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/builtin/credential/github/cli.go b/builtin/credential/github/cli.go
@@ -30,7 +30,7 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 		// Override the output
 		stdout := h.testStdout
 		if stdout == nil {
-			stdout = os.Stdout
+			stdout = os.Stderr
 		}
 
 		var err error

diff --git a/builtin/credential/ldap/cli.go b/builtin/credential/ldap/cli.go
@@ -26,10 +26,10 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 	}
 	password, ok := m["password"]
 	if !ok {
-		fmt.Printf("Password (will be hidden): ")
+		fmt.Fprintf(os.Stderr, "Password (will be hidden): ")
 		var err error
 		password, err = pwd.Read(os.Stdin)
-		fmt.Println()
+		fmt.Fprintf(os.Stderr, "\n")
 		if err != nil {
 			return nil, err
 		}

diff --git a/builtin/credential/okta/cli.go b/builtin/credential/okta/cli.go
@@ -25,10 +25,10 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 	}
 	password, ok := m["password"]
 	if !ok {
-		fmt.Printf("Password (will be hidden): ")
+		fmt.Fprintf(os.Stderr, "Password (will be hidden): ")
 		var err error
 		password, err = pwd.Read(os.Stdin)
-		fmt.Println()
+		fmt.Fprintf(os.Stderr, "\n")
 		if err != nil {
 			return nil, err
 		}

diff --git a/builtin/credential/token/cli.go b/builtin/credential/token/cli.go
@@ -37,7 +37,7 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 		// Override the output
 		stdout := h.testStdout
 		if stdout == nil {
-			stdout = os.Stdout
+			stdout = os.Stderr
 		}
 
 		// No arguments given, read the token from user input

diff --git a/builtin/credential/userpass/cli.go b/builtin/credential/userpass/cli.go
@@ -30,9 +30,9 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
 		return nil, fmt.Errorf("'username' must be specified")
 	}
 	if data.Password == "" {
-		fmt.Printf("Password (will be hidden): ")
+		fmt.Fprintf(os.Stderr, "Password (will be hidden): ")
 		password, err := pwd.Read(os.Stdin)
-		fmt.Println()
+		fmt.Fprintf(os.Stderr, "\n")
 		if err != nil {
 			return nil, err
 		}