Merge pull request #95 from DBCDK/fix-askpass-signals

ssh-askpass: ensure term restore before unclean exit
DBCDK · Dec 1, 2019 · 3bade9f · 3bade9f
2 parents 9221e28 + 97cd1ed
commit 3bade9f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ssh/ssh.go b/ssh/ssh.go
@@ -181,7 +181,15 @@ func (sshCtx *SSHContext) CmdInteractive(host Host, timeout int, parts ...string
 
 func askForSudoPassword() (string, error) {
 	fmt.Fprint(os.Stderr, "Please enter remote sudo password: ")
-	bytePassword, err := terminal.ReadPassword(int(syscall.Stdin))
+	stdin := int(syscall.Stdin)
+	state, err := terminal.GetState(stdin)
+	if err != nil {
+		return "", err
+	}
+	utils.AddFinalizer(func() {
+		terminal.Restore(stdin, state)
+	})
+	bytePassword, err := terminal.ReadPassword(stdin)
 	if err != nil {
 		return "", err
 	}