shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-26 09:57:26 +03:00
Code

ask-password: Add --echo to enable echoing the user input

Browse Source 
Programs such as OpenVPN may use ask-password for not only retrieving
passwords, but also usernames.  Masking usernames with * seems just silly.

 v2 - Don't mess with termios flags, instead print the input
      instead of an asterix.  Resolves issues with backspace
      and TAB input.

 v3 - Renamed 'do_echo' variables and argument to 'echo'.  Also
      modified the ask_password_{tty,agent,auto} API instead of
      additional wrapper functions.

[zj: undo changes to ask_password_auto, since no callers were using
     the new argument.]
This commit is contained in:
David Sommerseth 2014-10-03 15:53:45 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 75a0da952f
commit 64845bdc82
6 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man/systemd-ask-password.xml
View File

@ -126,6 +126,17 @@
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>--echo</option></term>
<listitem><para>Echo the user input
instead of masking it. This is useful
when using
<filename>systemd-ask-password</filename>
to query for usernames.
</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>--no-tty</option></term> <term><option>--no-tty</option></term>

12
src/ask-password/ask-password.c
View File

@ -45,6 +45,7 @@
static const char *arg_icon = NULL; static const char *arg_icon = NULL;
static const char *arg_id = NULL; static const char *arg_id = NULL;
static const char *arg_message = NULL; static const char *arg_message = NULL;
static bool arg_echo = false;
static bool arg_use_tty = true; static bool arg_use_tty = true;
static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC; static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC;
static bool arg_accept_cached = false; static bool arg_accept_cached = false;
@ -56,6 +57,7 @@ static void help(void) {
" -h --help Show this help\n" " -h --help Show this help\n"
" --icon=NAME Icon name\n" " --icon=NAME Icon name\n"
" --timeout=SEC Timeout in sec\n" " --timeout=SEC Timeout in sec\n"
" --echo Do not mask input (useful for usernames)\n"
" --no-tty Ask question via agent even on TTY\n" " --no-tty Ask question via agent even on TTY\n"
" --accept-cached Accept cached passwords\n" " --accept-cached Accept cached passwords\n"
" --multiple List multiple passwords if available\n" " --multiple List multiple passwords if available\n"
@ -68,6 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
enum { enum {
ARG_ICON = 0x100, ARG_ICON = 0x100,
ARG_TIMEOUT, ARG_TIMEOUT,
ARG_ECHO,
ARG_NO_TTY, ARG_NO_TTY,
ARG_ACCEPT_CACHED, ARG_ACCEPT_CACHED,
ARG_MULTIPLE, ARG_MULTIPLE,
@ -78,6 +81,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "icon", required_argument, NULL, ARG_ICON }, { "icon", required_argument, NULL, ARG_ICON },
{ "timeout", required_argument, NULL, ARG_TIMEOUT }, { "timeout", required_argument, NULL, ARG_TIMEOUT },
{ "echo", no_argument, NULL, ARG_ECHO },
{ "no-tty", no_argument, NULL, ARG_NO_TTY }, { "no-tty", no_argument, NULL, ARG_NO_TTY },
{ "accept-cached", no_argument, NULL, ARG_ACCEPT_CACHED }, { "accept-cached", no_argument, NULL, ARG_ACCEPT_CACHED },
{ "multiple", no_argument, NULL, ARG_MULTIPLE }, { "multiple", no_argument, NULL, ARG_MULTIPLE },
@ -109,6 +113,10 @@ static int parse_argv(int argc, char *argv[]) {
} }
break; break;
case ARG_ECHO:
arg_echo = true;
break;
case ARG_NO_TTY: case ARG_NO_TTY:
arg_use_tty = false; arg_use_tty = false;
break; break;
@ -160,7 +168,7 @@ int main(int argc, char *argv[]) {
if (arg_use_tty && isatty(STDIN_FILENO)) { if (arg_use_tty && isatty(STDIN_FILENO)) {
char *password = NULL; char *password = NULL;
if ((r = ask_password_tty(arg_message, timeout, NULL, &password)) >= 0) { if ((r = ask_password_tty(arg_message, timeout, arg_echo, NULL, &password)) >= 0) {
puts(password); puts(password);
free(password); free(password);
} }
@ -168,7 +176,7 @@ int main(int argc, char *argv[]) {
} else { } else {
char **l; char **l;
if ((r = ask_password_agent(arg_message, arg_icon, arg_id, timeout, arg_accept_cached, &l)) >= 0) { if ((r = ask_password_agent(arg_message, arg_icon, arg_id, timeout, arg_echo, arg_accept_cached, &l)) >= 0) {
char **p; char **p;
STRV_FOREACH(p, l) { STRV_FOREACH(p, l) {

4
src/firstboot/firstboot.c
View File

@ -491,7 +491,7 @@ static int prompt_root_password(void) {
for (;;) { for (;;) {
_cleanup_free_ char *a = NULL, *b = NULL; _cleanup_free_ char *a = NULL, *b = NULL;
r = ask_password_tty(msg1, 0, NULL, &a); r = ask_password_tty(msg1, 0, false, NULL, &a);
if (r < 0) { if (r < 0) {
log_error("Failed to query root password: %s", strerror(-r)); log_error("Failed to query root password: %s", strerror(-r));
return r; return r;
@ -502,7 +502,7 @@ static int prompt_root_password(void) {
break; break;
} }
r = ask_password_tty(msg2, 0, NULL, &b); r = ask_password_tty(msg2, 0, false, NULL, &b);
if (r < 0) { if (r < 0) {
log_error("Failed to query root password: %s", strerror(-r)); log_error("Failed to query root password: %s", strerror(-r));
clear_string(a); clear_string(a);

10
src/shared/ask-password-api.c
View File

@ -52,6 +52,7 @@ static void backspace_chars(int ttyfd, size_t p) {
int ask_password_tty( int ask_password_tty(
const char *message, const char *message,
usec_t until, usec_t until,
bool echo,
const char *flag_file, const char *flag_file,
char **_passphrase) { char **_passphrase) {
@ -218,7 +219,7 @@ int ask_password_tty(
passphrase[p++] = c; passphrase[p++] = c;
if (!silent_mode && ttyfd >= 0) if (!silent_mode && ttyfd >= 0)
loop_write(ttyfd, "*", 1, false); loop_write(ttyfd, echo ? &c : "*", 1, false);
dirty = true; dirty = true;
} }
@ -300,6 +301,7 @@ int ask_password_agent(
const char *icon, const char *icon,
const char *id, const char *id,
usec_t until, usec_t until,
bool echo,
bool accept_cached, bool accept_cached,
char ***_passphrases) { char ***_passphrases) {
@ -362,10 +364,12 @@ int ask_password_agent(
"PID="PID_FMT"\n" "PID="PID_FMT"\n"
"Socket=%s\n" "Socket=%s\n"
"AcceptCached=%i\n" "AcceptCached=%i\n"
"Echo=%i\n"
"NotAfter="USEC_FMT"\n", "NotAfter="USEC_FMT"\n",
getpid(), getpid(),
socket_name, socket_name,
accept_cached ? 1 : 0, accept_cached ? 1 : 0,
echo ? 1 : 0,
until); until);
if (message) if (message)
@ -550,7 +554,7 @@ int ask_password_auto(const char *message, const char *icon, const char *id,
int r; int r;
char *s = NULL, **l = NULL; char *s = NULL, **l = NULL;
r = ask_password_tty(message, until, NULL, &s); r = ask_password_tty(message, until, false, NULL, &s);
if (r < 0) if (r < 0)
return r; return r;
@ -561,5 +565,5 @@ int ask_password_auto(const char *message, const char *icon, const char *id,
*_passphrases = l; *_passphrases = l;
return r; return r;
} else } else
return ask_password_agent(message, icon, id, until, accept_cached, _passphrases); return ask_password_agent(message, icon, id, until, false, accept_cached, _passphrases);
} }

4
src/shared/ask-password-api.h
View File

@ -23,10 +23,10 @@
#include "util.h" #include "util.h"
int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase); int ask_password_tty(const char *message, usec_t until, bool echo, const char *flag_file, char **_passphrase);
int ask_password_agent(const char *message, const char *icon, const char *id, int ask_password_agent(const char *message, const char *icon, const char *id,
usec_t until, bool accept_cached, char ***_passphrases); usec_t until, bool echo, bool accept_cached, char ***_passphrases);
int ask_password_auto(const char *message, const char *icon, const char *id, int ask_password_auto(const char *message, const char *icon, const char *id,
usec_t until, bool accept_cached, char ***_passphrases); usec_t until, bool accept_cached, char ***_passphrases);

5
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -214,7 +214,7 @@ static int parse_password(const char *filename, char **wall) {
_cleanup_free_ char *socket_name = NULL, *message = NULL, *packet = NULL; _cleanup_free_ char *socket_name = NULL, *message = NULL, *packet = NULL;
uint64_t not_after = 0; uint64_t not_after = 0;
unsigned pid = 0; unsigned pid = 0;
bool accept_cached = false; bool accept_cached = false, echo = false;
const ConfigTableItem items[] = { const ConfigTableItem items[] = {
{ "Ask", "Socket", config_parse_string, 0, &socket_name }, { "Ask", "Socket", config_parse_string, 0, &socket_name },
@ -222,6 +222,7 @@ static int parse_password(const char *filename, char **wall) {
{ "Ask", "Message", config_parse_string, 0, &message }, { "Ask", "Message", config_parse_string, 0, &message },
{ "Ask", "PID", config_parse_unsigned, 0, &pid }, { "Ask", "PID", config_parse_unsigned, 0, &pid },
{ "Ask", "AcceptCached", config_parse_bool, 0, &accept_cached }, { "Ask", "AcceptCached", config_parse_bool, 0, &accept_cached },
{ "Ask", "Echo", config_parse_bool, 0, &echo },
{} {}
}; };
@ -314,7 +315,7 @@ static int parse_password(const char *filename, char **wall) {
return tty_fd; return tty_fd;
} }
r = ask_password_tty(message, not_after, filename, &password); r = ask_password_tty(message, not_after, echo, filename, &password);
if (arg_console) { if (arg_console) {
safe_close(tty_fd); safe_close(tty_fd);