From ee29490fe02663a55215a0f6f9e77e940f738eb6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 13 Dec 2017 11:47:23 +0100 Subject: [PATCH] read_password improvements * Cancel on Ctrl+C (die()) * Finish on Ctrl+D (eof/eot) without appending a newline * Also finish on \n to be sure. Signed-off-by: Wolfgang Bumiller Reviewed-by: Thomas Lamprecht Tested-by: Thomas Lamprecht --- src/PVE/PTY.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PVE/PTY.pm b/src/PVE/PTY.pm index 1178ea7..fa78196 100644 --- a/src/PVE/PTY.pm +++ b/src/PVE/PTY.pm @@ -194,10 +194,13 @@ sub read_password(;$$) { syswrite($outfd, $query, length($query)); while (($got = sysread($infd, $ch, 1))) { my ($ord) = unpack('C', $ch); - if ($ord == 0xD) { + last if $ord == 4; # ^D / EOF + if ($ord == 0xA || $ord == 0xD) { # newline, we're done syswrite($outfd, "\r\n", 2); last; + } elsif ($ord == 3) { # ^C + die "password input aborted\n"; } elsif ($ord == 0x7f) { # backspace - if it's the first key disable # asterisks -- 2.39.2