From 487424eb190d4f174ff2aa1fa2ebb27f4c574030 Mon Sep 17 00:00:00 2001 From: Yukai Tu Date: Sat, 24 Mar 2018 23:52:51 -0700 Subject: [PATCH] Fix key add override bug --- client/input.go | 22 ++++++++++++++++++++++ client/keys/add.go | 10 ++++++++++ 2 files changed, 32 insertions(+) diff --git a/client/input.go b/client/input.go index 6036b68f9..53906ca88 100644 --- a/client/input.go +++ b/client/input.go @@ -73,6 +73,28 @@ func GetCheckPassword(prompt, prompt2 string, buf *bufio.Reader) (string, error) return pass, nil } +// GetConfirmation will request user give the confirmation from stdin. +// "y", "Y", "yes", "YES", and "Yes" all count as confirmations. +// If the input is not recognized, it will ask again. +func GetConfirmation(prompt string, buf *bufio.Reader) (bool, error) { + for { + if inputIsTty() { + fmt.Print(fmt.Sprintf("%s [y/n]:", prompt)) + } + response, err := readLineFromBuf(buf) + if err != nil { + return false, err + } + + response = strings.ToLower(strings.TrimSpace(response)) + if response == "y" || response == "yes" { + return true, nil + } else if response == "n" || response == "no" { + return false, nil + } + } +} + // inputIsTty returns true iff we have an interactive prompt, // where we can disable echo and request to repeat the password. // If false, we can optimize for piped input from another command diff --git a/client/keys/add.go b/client/keys/add.go index 356c7369c..d68983028 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -60,6 +60,16 @@ func runAddCmd(cmd *cobra.Command, args []string) error { if err != nil { return err } + + _, err := kb.Get(name) + if err == nil { + // account exists, ask for user confirmation + if response, err := client.GetConfirmation( + fmt.Sprintf("override the existing name %s", name), buf); err != nil || !response { + return err + } + } + pass, err = client.GetCheckPassword( "Enter a passphrase for your key:", "Repeat the passphrase:", buf)