X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftty-ask-password-agent%2Ftty-ask-password-agent.c;h=2c540ba17003ebd2f5176c7ae913803348993084;hp=9fbd7f5fb2eda43c3ead712e2ea0bd8ad2ec45f2;hb=7de80bfe2e61d5818601ccfddbadad3b7703ed70;hpb=dce818b390a857a11f7dd634684500675cf79833 diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index 9fbd7f5fb..2c540ba17 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -34,11 +34,13 @@ #include "util.h" #include "mkdir.h" +#include "path-util.h" #include "conf-parser.h" #include "utmp-wtmp.h" #include "socket-util.h" #include "ask-password-api.h" #include "strv.h" +#include "build.h" static enum { ACTION_LIST, @@ -58,11 +60,11 @@ static int ask_password_plymouth( char ***_passphrases) { int fd = -1, notify = -1; - union sockaddr_union sa; + union sockaddr_union sa = {}; char *packet = NULL; ssize_t k; int r, n; - struct pollfd pollfd[2]; + struct pollfd pollfd[2] = {}; char buffer[LINE_MAX]; size_t p = 0; enum { @@ -89,7 +91,6 @@ static int ask_password_plymouth( goto finish; } - zero(sa); sa.sa.sa_family = AF_UNIX; strncpy(sa.un.sun_path+1, "/org/freedesktop/plymouthd", sizeof(sa.un.sun_path)-1); if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) { @@ -101,8 +102,9 @@ static int ask_password_plymouth( if (accept_cached) { packet = strdup("c"); n = 1; - } else - asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), message, &n); + } else if (asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), + message, &n) < 0) + packet = NULL; if (!packet) { r = -ENOMEM; @@ -114,7 +116,6 @@ static int ask_password_plymouth( goto finish; } - zero(pollfd); pollfd[POLL_SOCKET].fd = fd; pollfd[POLL_SOCKET].events = POLLIN; pollfd[POLL_INOTIFY].fd = notify; @@ -234,11 +235,8 @@ static int ask_password_plymouth( r = 0; finish: - if (notify >= 0) - close_nointr_nofail(notify); - - if (fd >= 0) - close_nointr_nofail(fd); + safe_close(notify); + safe_close(fd); free(packet); @@ -246,10 +244,9 @@ finish: } static int parse_password(const char *filename, char **wall) { - char *socket_name = NULL, *message = NULL, *packet = NULL; + _cleanup_free_ char *socket_name = NULL, *message = NULL, *packet = NULL; uint64_t not_after = 0; unsigned pid = 0; - int socket_fd = -1; bool accept_cached = false; const ConfigTableItem items[] = { @@ -261,48 +258,31 @@ static int parse_password(const char *filename, char **wall) { { NULL, NULL, NULL, 0, NULL } }; - FILE *f; int r; assert(filename); - f = fopen(filename, "re"); - if (!f) { - if (errno == ENOENT) - return 0; - - log_error("open(%s): %m", filename); - return -errno; - } - - r = config_parse(filename, f, NULL, config_item_table_lookup, (void*) items, true, NULL); - if (r < 0) { - log_error("Failed to parse password file %s: %s", filename, strerror(-r)); - goto finish; - } + r = config_parse(NULL, filename, NULL, + NULL, + config_item_table_lookup, items, + true, false, true, NULL); + if (r < 0) + return r; if (!socket_name) { log_error("Invalid password file %s", filename); - r = -EBADMSG; - goto finish; + return -EBADMSG; } - if (not_after > 0) { - if (now(CLOCK_MONOTONIC) > not_after) { - r = 0; - goto finish; - } - } + if (not_after > 0 && now(CLOCK_MONOTONIC) > not_after) + return 0; - if (pid > 0 && - kill(pid, 0) < 0 && - errno == ESRCH) { - r = 0; - goto finish; - } + if (pid > 0 && !pid_is_alive(pid)) + return 0; if (arg_action == ACTION_LIST) printf("'%s' (PID %u)\n", message, pid); + else if (arg_action == ACTION_WALL) { char *_wall; @@ -312,44 +292,40 @@ static int parse_password(const char *filename, char **wall) { *wall ? *wall : "", *wall ? "\r\n\r\n" : "", message, - pid) < 0) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + pid) < 0) + return log_oom(); free(*wall); *wall = _wall; + } else { - union { - struct sockaddr sa; - struct sockaddr_un un; - } sa; + union sockaddr_union sa = {}; size_t packet_length = 0; + _cleanup_close_ int socket_fd = -1; assert(arg_action == ACTION_QUERY || arg_action == ACTION_WATCH); if (access(socket_name, W_OK) < 0) { - if (arg_action == ACTION_QUERY) log_info("Not querying '%s' (PID %u), lacking privileges.", message, pid); - r = 0; - goto finish; + return 0; } if (arg_plymouth) { - char **passwords = NULL; + _cleanup_strv_free_ char **passwords = NULL; - if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) { + r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords); + if (r >= 0) { char **p; packet_length = 1; STRV_FOREACH(p, passwords) packet_length += strlen(*p) + 1; - if (!(packet = new(char, packet_length))) + packet = new(char, packet_length); + if (!packet) r = -ENOMEM; else { char *d; @@ -364,73 +340,60 @@ static int parse_password(const char *filename, char **wall) { } else { int tty_fd = -1; - char *password; + _cleanup_free_ char *password = NULL; - if (arg_console) - if ((tty_fd = acquire_terminal("/dev/console", false, false, false)) < 0) { - r = tty_fd; - goto finish; - } + if (arg_console) { + tty_fd = acquire_terminal("/dev/console", false, false, false, (usec_t) -1); + if (tty_fd < 0) + return tty_fd; + } r = ask_password_tty(message, not_after, filename, &password); if (arg_console) { - close_nointr_nofail(tty_fd); + safe_close(tty_fd); release_terminal(); } if (r >= 0) { - packet_length = 1+strlen(password)+1; - if (!(packet = new(char, packet_length))) + packet_length = 1 + strlen(password) + 1; + packet = new(char, packet_length); + if (!packet) r = -ENOMEM; else { packet[0] = '+'; - strcpy(packet+1, password); + strcpy(packet + 1, password); } - - free(password); } } - if (r == -ETIME || r == -ENOENT) { + if (r == -ETIME || r == -ENOENT) /* If the query went away, that's OK */ - r = 0; - goto finish; - } + return 0; if (r < 0) { log_error("Failed to query password: %s", strerror(-r)); - goto finish; + return r; } - if ((socket_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { + socket_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); + if (socket_fd < 0) { log_error("socket(): %m"); - r = -errno; - goto finish; + return -errno; } - zero(sa); sa.un.sun_family = AF_UNIX; strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path)); - if (sendto(socket_fd, packet, packet_length, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) { + r = sendto(socket_fd, packet, packet_length, MSG_NOSIGNAL, &sa.sa, + offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)); + if (r < 0) { log_error("Failed to send: %m"); - r = -errno; - goto finish; + return r; } } -finish: - fclose(f); - - if (socket_fd >= 0) - close_nointr_nofail(socket_fd); - - free(packet); - free(socket_name); - free(message); - - return r; + return 0; } static int wall_tty_block(void) { @@ -440,12 +403,12 @@ static int wall_tty_block(void) { r = get_ctty_devnr(0, &devnr); if (r < 0) - return -r; + return r; if (asprintf(&p, "/run/systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0) return -ENOMEM; - mkdir_parents(p, 0700); + mkdir_parents_label(p, 0700); mkfifo(p, 0600); fd = open(p, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); @@ -496,7 +459,7 @@ static bool wall_tty_match(const char *path) { return true; /* What, we managed to open the pipe? Then this tty is filtered. */ - close_nointr_nofail(fd); + safe_close(fd); return false; } @@ -509,7 +472,7 @@ static int show_passwords(void) { if (errno == ENOENT) return 0; - log_error("opendir(): %m"); + log_error("opendir(/run/systemd/ask-password): %m"); return -errno; } @@ -531,8 +494,7 @@ static int show_passwords(void) { continue; if (!(p = strappend("/run/systemd/ask-password/", de->d_name))) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -543,7 +505,7 @@ static int show_passwords(void) { free(p); if (wall) { - utmp_wall(wall, wall_tty_match); + utmp_wall(wall, NULL, wall_tty_match); free(wall); } } @@ -563,13 +525,13 @@ static int watch_passwords(void) { }; int notify = -1, signal_fd = -1, tty_block_fd = -1; - struct pollfd pollfd[_FD_MAX]; + struct pollfd pollfd[_FD_MAX] = {}; sigset_t mask; int r; tty_block_fd = wall_tty_block(); - mkdir_p("/run/systemd/ask-password", 0755); + mkdir_p_label("/run/systemd/ask-password", 0755); if ((notify = inotify_init1(IN_CLOEXEC)) < 0) { r = -errno; @@ -591,7 +553,6 @@ static int watch_passwords(void) { goto finish; } - zero(pollfd); pollfd[FD_INOTIFY].fd = notify; pollfd[FD_INOTIFY].events = POLLIN; pollfd[FD_SIGNAL].fd = signal_fd; @@ -620,14 +581,9 @@ static int watch_passwords(void) { r = 0; finish: - if (notify >= 0) - close_nointr_nofail(notify); - - if (signal_fd >= 0) - close_nointr_nofail(signal_fd); - - if (tty_block_fd >= 0) - close_nointr_nofail(tty_block_fd); + safe_close(notify); + safe_close(signal_fd); + safe_close(tty_block_fd); return r; } @@ -637,6 +593,7 @@ static int help(void) { printf("%s [OPTIONS...]\n\n" "Process system password requests.\n\n" " -h --help Show this help\n" + " --version Show package version\n" " --list Show pending password requests\n" " --query Process pending password requests\n" " --watch Continuously process password requests\n" @@ -656,18 +613,20 @@ static int parse_argv(int argc, char *argv[]) { ARG_WATCH, ARG_WALL, ARG_PLYMOUTH, - ARG_CONSOLE + ARG_CONSOLE, + ARG_VERSION }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, { "list", no_argument, NULL, ARG_LIST }, { "query", no_argument, NULL, ARG_QUERY }, { "watch", no_argument, NULL, ARG_WATCH }, { "wall", no_argument, NULL, ARG_WALL }, { "plymouth", no_argument, NULL, ARG_PLYMOUTH }, { "console", no_argument, NULL, ARG_CONSOLE }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -680,7 +639,11 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); + return help(); + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); return 0; case ARG_LIST: @@ -711,8 +674,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -727,6 +689,7 @@ static int parse_argv(int argc, char *argv[]) { int main(int argc, char *argv[]) { int r; + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open();