[systemd-commits] 2 commits - .gitignore Makefile.am src/ask-password.c src/conf-parser.c src/conf-parser.h src/.gitignore src/reply-password.c src/tty-ask-password-agent.c src/util.c src/util.h TODO
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Oct 25 11:43:40 PDT 2010
.gitignore | 3
Makefile.am | 10 +
TODO | 12 -
src/.gitignore | 2
src/ask-password.c | 113 ++-----------
src/conf-parser.c | 25 +++
src/conf-parser.h | 1
src/reply-password.c | 4
src/tty-ask-password-agent.c | 356 +++++++++++++++++++++++++++++++++++++++++++
src/util.c | 164 +++++++++++++++++++
src/util.h | 2
11 files changed, 592 insertions(+), 100 deletions(-)
New commits:
commit 50f298ec0fbb0ea2d09d3952fc522bc8db8f28e6
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 25 20:43:34 2010 +0200
update fixme
diff --git a/TODO b/TODO
index 9a2a7b1..9bb162e 100644
--- a/TODO
+++ b/TODO
@@ -58,9 +58,11 @@
* start getty 2-6 only when actual vt switch happens
(same model as socket on-demand activation)
-* ask-password tty agent, ask-password plymouth agent
+* ask-password plymouth agent
-* ask-password tty timeout
+* spawn ask-password tty agent temporarily in systemctl
+
+* spawn ask-password wall agent on boot via .path unit
* readahead: btrfs/LVM SSD detection
@@ -68,7 +70,7 @@
* when processes remain in a service even though the start command failed enter active
-* fix plymouth socket, when plymouth started to use a clean one
+* fix plymouth socket name, when plymouth started to use a clean one
* parse early boot time env var from dracut
@@ -76,6 +78,8 @@
* add switch to disable pull in retroactively
+* cryptsetup
+
External:
* patch kernel to add /proc/swaps change notifications
@@ -92,8 +96,6 @@ External:
* procps, psmisc, sysvinit-tools, hostname → util-linux-ng
-* make sysinit honour forcefsck/fastboot from the kernel command line fsck.mode=auto|force|skip
-
* pam: fix double sudo session cleanup:
http://www.gratisoft.us/bugzilla/show_bug.cgi?id=421
commit ec863ba65a41e58680a3ab15841243088284e808
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 25 20:35:17 2010 +0200
ask-password: add basic tty agent
diff --git a/.gitignore b/.gitignore
index ad0f5f4..2a30fab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+systemd-tty-ask-password-agent
systemd-fsck
systemd-quotacheck
systemd-user-sessions
@@ -6,7 +7,7 @@ systemd-tmpfiles
systemd-readahead-collect
systemd-readahead-replay
systemd-reply-password
-systemd-ask-password-agent
+systemd-gnome-ask-password-agent
systemd-ask-password
systemd-kmsg-syslogd
systemd-remount-api-vfs
diff --git a/Makefile.am b/Makefile.am
index dcaf382..62dcf78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,8 @@ rootbin_PROGRAMS = \
systemd \
systemctl \
systemd-notify \
- systemd-ask-password
+ systemd-ask-password \
+ systemd-tty-ask-password-agent
bin_PROGRAMS = \
systemd-cgls
@@ -880,6 +881,13 @@ systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
+systemd_tty_ask_password_agent_SOURCES = \
+ src/tty-ask-password-agent.c \
+ src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+ libsystemd-basic.la
+
pam_systemd_la_SOURCES = \
src/pam-module.c \
src/cgroup-util.c \
diff --git a/src/.gitignore b/src/.gitignore
index 389f26d..9c01ae1 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,3 @@
-ask-password-agent.c
+gnome-ask-password-agent.c
systemd-interfaces.c
systemadm.c
diff --git a/src/ask-password.c b/src/ask-password.c
index 9e4d9e7..493bbfe 100644
--- a/src/ask-password.c
+++ b/src/ask-password.c
@@ -62,9 +62,9 @@ static int create_socket(char **name) {
zero(sa);
sa.un.sun_family = AF_UNIX;
- snprintf(sa.un.sun_path+1, sizeof(sa.un.sun_path)-1, "/org/freedesktop/systemd1/ask-password/%llu", random_ull());
+ snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/dev/.systemd/ask-password/sck.%llu", random_ull());
- if (bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
+ if (bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
r = -errno;
log_error("bind() failed: %m");
goto fail;
@@ -76,7 +76,7 @@ static int create_socket(char **name) {
goto fail;
}
- if (!(c = strdup(sa.un.sun_path+1))) {
+ if (!(c = strdup(sa.un.sun_path))) {
r = -ENOMEM;
log_error("Out of memory");
goto fail;
@@ -97,7 +97,7 @@ static int help(void) {
"Query the user for a system passphrase, via the TTY or an UI agent.\n\n"
" -h --help Show this help\n"
" --icon=NAME Icon name\n"
- " --timeout=USEC Timeout in usec\n"
+ " --timeout=SEC Timeout in sec\n"
" --no-tty Ask question via agent even on TTY\n",
program_invocation_short_name);
@@ -176,6 +176,8 @@ static int ask_agent(void) {
sigset_t mask;
usec_t not_after;
+ mkdir_p("/dev/.systemd/ask-password", 0755);
+
if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
log_error("Failed to create password file: %m");
r = -errno;
@@ -211,8 +213,10 @@ static int ask_agent(void) {
fprintf(f,
"[Ask]\n"
+ "PID=%lu\n"
"Socket=%s\n"
"NotAfter=%llu\n",
+ (unsigned long) getpid(),
socket_name,
(unsigned long long) not_after);
@@ -354,6 +358,11 @@ finish:
if (fd >= 0)
close_nointr_nofail(fd);
+ if (socket_name) {
+ unlink(socket_name);
+ free(socket_name);
+ }
+
if (socket_fd >= 0)
close_nointr_nofail(socket_fd);
@@ -368,89 +377,6 @@ finish:
return r;
}
-static int ask_tty(void) {
- struct termios old_termios, new_termios;
- char passphrase[LINE_MAX];
- FILE *ttyf;
-
- if (!(ttyf = fopen("/dev/tty", "w"))) {
- log_error("Failed to open /dev/tty: %m");
- return -errno;
- }
-
- fputs("\x1B[1m", ttyf);
- fprintf(ttyf, "%s: ", arg_message);
- fputs("\x1B[0m", ttyf);
- fflush(ttyf);
-
- if (tcgetattr(STDIN_FILENO, &old_termios) >= 0) {
-
- new_termios = old_termios;
-
- new_termios.c_lflag &= ~(ICANON|ECHO);
- new_termios.c_cc[VMIN] = 1;
- new_termios.c_cc[VTIME] = 0;
-
- if (tcsetattr(STDIN_FILENO, TCSADRAIN, &new_termios) >= 0) {
- size_t p = 0;
- int r = 0;
-
- for (;;) {
- size_t k;
- char c;
-
- k = fread(&c, 1, 1, stdin);
-
- if (k <= 0) {
- r = -EIO;
- break;
- }
-
- if (c == '\n')
- break;
- else if (c == '\b' || c == 127) {
- if (p > 0) {
- p--;
- fputs("\b \b", ttyf);
- }
- } else {
- passphrase[p++] = c;
- fputc('*', ttyf);
- }
-
- fflush(ttyf);
- }
-
- fputc('\n', ttyf);
- fclose(ttyf);
- tcsetattr(STDIN_FILENO, TCSADRAIN, &old_termios);
-
- if (r < 0)
- return -EIO;
-
- passphrase[p] = 0;
-
- fputs(passphrase, stdout);
- fflush(stdout);
- return 0;
- }
-
- }
-
- fclose(ttyf);
-
- if (!fgets(passphrase, sizeof(passphrase), stdin)) {
- log_error("Failed to read password.");
- return -EIO;
- }
-
- truncate_nl(passphrase);
- fputs(passphrase, stdout);
- fflush(stdout);
-
- return 0;
-}
-
int main(int argc, char *argv[]) {
int r;
@@ -460,9 +386,16 @@ int main(int argc, char *argv[]) {
if ((r = parse_argv(argc, argv)) <= 0)
goto finish;
- if (arg_use_tty && isatty(STDIN_FILENO))
- r = ask_tty();
- else
+ if (arg_use_tty && isatty(STDIN_FILENO)) {
+ char *password = NULL;
+
+ if ((r = ask_password_tty(arg_message, now(CLOCK_MONOTONIC) + arg_timeout, NULL, &password)) >= 0) {
+ fputs(password, stdout);
+ fflush(stdout);
+ free(password);
+ }
+
+ } else
r = ask_agent();
finish:
diff --git a/src/conf-parser.c b/src/conf-parser.c
index d18b2a1..aac64b2 100644
--- a/src/conf-parser.c
+++ b/src/conf-parser.c
@@ -246,6 +246,31 @@ int config_parse_int(
return 0;
}
+int config_parse_uint64(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ uint64_t *u = data;
+ int r;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if ((r = safe_atou64(rvalue, u)) < 0) {
+ log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
+ return r;
+ }
+
+ return 0;
+}
+
int config_parse_unsigned(
const char *filename,
unsigned line,
diff --git a/src/conf-parser.h b/src/conf-parser.h
index 9ff65a9..019b7af 100644
--- a/src/conf-parser.h
+++ b/src/conf-parser.h
@@ -46,6 +46,7 @@ int config_parse(const char *filename, FILE *f, const char* const *sections, con
/* Generic parsers */
int config_parse_int(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
int config_parse_unsigned(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
+int config_parse_uint64(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
int config_parse_size(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
int config_parse_bool(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
int config_parse_string(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata);
diff --git a/src/reply-password.c b/src/reply-password.c
index 24d73a7..575a437 100644
--- a/src/reply-password.c
+++ b/src/reply-password.c
@@ -49,9 +49,9 @@ static int send_on_socket(int fd, const char *socket_name, const void *packet, s
zero(sa);
sa.un.sun_family = AF_UNIX;
- strncpy(sa.un.sun_path+1, socket_name, sizeof(sa.un.sun_path)-1);
+ strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
- if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(socket_name)) < 0) {
+ if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) {
log_error("Failed to send: %m");
return -1;
}
diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c
new file mode 100644
index 0000000..9c4d076
--- /dev/null
+++ b/src/tty-ask-password-agent.c
@@ -0,0 +1,356 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdbool.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stddef.h>
+#include <sys/poll.h>
+#include <sys/inotify.h>
+#include <unistd.h>
+#include <getopt.h>
+
+#include "util.h"
+#include "conf-parser.h"
+#include "utmp-wtmp.h"
+
+static enum {
+ ACTION_LIST,
+ ACTION_QUERY,
+ ACTION_WATCH,
+ ACTION_WALL
+} arg_action = ACTION_QUERY;
+
+static int parse_password(const char *filename) {
+ char *socket_name = NULL, *message = NULL, *packet = NULL;
+ uint64_t not_after = 0;
+ unsigned pid = 0;
+ int socket_fd = -1;
+
+ const ConfigItem items[] = {
+ { "Socket", config_parse_string, &socket_name, "Ask" },
+ { "NotAfter", config_parse_uint64, ¬_after, "Ask" },
+ { "Message", config_parse_string, &message, "Ask" },
+ { "PID", config_parse_unsigned, &pid, "Ask" },
+ };
+
+ FILE *f;
+ int r;
+ usec_t n;
+
+ assert(filename);
+
+ if (!(f = fopen(filename, "re"))) {
+
+ if (errno == ENOENT)
+ return 0;
+
+ log_error("open(%s): %m", filename);
+ return -errno;
+ }
+
+ if ((r = config_parse(filename, f, NULL, items, false, NULL)) < 0) {
+ log_error("Failed to parse password file %s: %s", filename, strerror(-r));
+ goto finish;
+ }
+
+ if (!socket_name || not_after <= 0) {
+ log_error("Invalid password file %s", filename);
+ r = -EBADMSG;
+ goto finish;
+ }
+
+ n = now(CLOCK_MONOTONIC);
+ if (n > not_after) {
+ r = 0;
+ goto finish;
+ }
+
+ if (arg_action == ACTION_LIST)
+ printf("'%s' (PID %u)\n", message, pid);
+ else if (arg_action == ACTION_WALL) {
+ char *wall;
+
+ if (asprintf(&wall,
+ "Password entry required for \'%s\' (PID %u).\r\n"
+ "Please enter password with the systemd-tty-password-agent tool!",
+ message,
+ pid) < 0) {
+ log_error("Out of memory");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ r = utmp_wall(wall);
+ free(wall);
+ } else {
+ union {
+ struct sockaddr sa;
+ struct sockaddr_un un;
+ } sa;
+ char *password;
+
+ 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;
+ }
+
+ if ((r = ask_password_tty(message, not_after, filename, &password)) < 0) {
+ log_error("Failed to query passwords: %s", strerror(-r));
+ goto finish;
+ }
+
+ asprintf(&packet, "+%s", password);
+ free(password);
+
+ if (!packet) {
+ log_error("Out of memory");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((socket_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ log_error("socket(): %m");
+ r = -errno;
+ goto finish;
+ }
+
+ 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, strlen(packet), MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) {
+ log_error("Failed to send: %m");
+ r = -errno;
+ goto finish;
+ }
+ }
+
+finish:
+ fclose(f);
+
+ if (socket_fd >= 0)
+ close_nointr_nofail(socket_fd);
+
+ free(packet);
+ free(socket_name);
+ free(message);
+
+ return r;
+}
+
+static int show_passwords(void) {
+ DIR *d;
+ struct dirent *de;
+ int r = 0;
+
+ if (!(d = opendir("/dev/.systemd/ask-password"))) {
+ if (errno == ENOENT)
+ return 0;
+
+ log_error("opendir(): %m");
+ return -errno;
+ }
+
+ while ((de = readdir(d))) {
+ char *p;
+ int q;
+
+ if (de->d_type != DT_REG)
+ continue;
+
+ if (ignore_file(de->d_name))
+ continue;
+
+ if (!startswith(de->d_name, "ask."))
+ continue;
+
+ if (!(p = strappend("/dev/.systemd/ask-password/", de->d_name))) {
+ log_error("Out of memory");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((q = parse_password(p)) < 0)
+ r = q;
+
+ free(p);
+ }
+
+finish:
+ if (d)
+ closedir(d);
+
+ return r;
+}
+
+static int watch_passwords(void) {
+ int notify;
+ struct pollfd pollfd;
+ int r;
+
+ mkdir_p("/dev/.systemd/ask-password", 0755);
+
+ if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if (inotify_add_watch(notify, "/dev/.systemd/ask-password", IN_CLOSE_WRITE|IN_MOVED_TO) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ zero(pollfd);
+ pollfd.fd = notify;
+ pollfd.events = POLLIN;
+
+ for (;;) {
+ if ((r = show_passwords()) < 0)
+ break;
+
+ if (poll(&pollfd, 1, -1) < 0) {
+
+ if (errno == EINTR)
+ continue;
+
+ r = -errno;
+ goto finish;
+ }
+
+ if (pollfd.revents != 0)
+ flush_fd(notify);
+ }
+
+ r = 0;
+
+finish:
+ if (notify >= 0)
+ close_nointr_nofail(notify);
+
+ return r;
+}
+
+static int help(void) {
+
+ printf("%s [OPTIONS...]\n\n"
+ "Process system password requests.\n\n"
+ " -h --help Show this help\n"
+ " --list Show pending password requests\n"
+ " --query Process pending password requests\n"
+ " --watch Continously process password requests\n"
+ " --wall Continously forward password requests to wall\n",
+ program_invocation_short_name);
+
+ return 0;
+}
+
+static int parse_argv(int argc, char *argv[]) {
+
+ enum {
+ ARG_LIST = 0x100,
+ ARG_QUERY,
+ ARG_WATCH,
+ ARG_WALL,
+ };
+
+ static const struct option options[] = {
+ { "help", no_argument, NULL, 'h' },
+ { "list", no_argument, NULL, ARG_LIST },
+ { "query", no_argument, NULL, ARG_QUERY },
+ { "watch", no_argument, NULL, ARG_WATCH },
+ { "wall", no_argument, NULL, ARG_WALL },
+ { NULL, 0, NULL, 0 }
+ };
+
+ int c;
+
+ assert(argc >= 0);
+ assert(argv);
+
+ while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+
+ switch (c) {
+
+ case 'h':
+ help();
+ return 0;
+
+ case ARG_LIST:
+ arg_action = ACTION_LIST;
+ break;
+
+ case ARG_QUERY:
+ arg_action = ACTION_QUERY;
+ break;
+
+ case ARG_WATCH:
+ arg_action = ACTION_WATCH;
+ break;
+
+ case ARG_WALL:
+ arg_action = ACTION_WALL;
+ break;
+
+ case '?':
+ return -EINVAL;
+
+ default:
+ log_error("Unknown option code %c", c);
+ return -EINVAL;
+ }
+ }
+
+ if (optind != argc) {
+ help();
+ return -EINVAL;
+ }
+
+ return 1;
+}
+
+int main(int argc, char *argv[]) {
+ int r;
+
+ log_parse_environment();
+ log_open();
+
+ if ((r = parse_argv(argc, argv)) <= 0)
+ goto finish;
+
+ if (arg_action == ACTION_WATCH ||
+ arg_action == ACTION_WALL)
+ r = watch_passwords();
+ else
+ r = show_passwords();
+
+finish:
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/src/util.c b/src/util.c
index cf3cf29..98422b2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3350,6 +3350,170 @@ int signal_from_string_try_harder(const char *s) {
return signo;
}
+int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase) {
+ struct termios old_termios, new_termios;
+ char passphrase[LINE_MAX];
+ size_t p = 0;
+ int r, ttyfd = -1, notify = -1;
+ struct pollfd pollfd[2];
+ bool reset_tty = false;
+ enum {
+ POLL_TTY,
+ POLL_INOTIFY
+ };
+
+ assert(message);
+ assert(_passphrase);
+
+ if (flag_file) {
+ if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
+ r = -errno;
+ goto finish;
+ }
+ }
+
+ if ((ttyfd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC)) >= 0) {
+
+ if (tcgetattr(ttyfd, &old_termios) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ loop_write(ttyfd, "\x1B[1m", 4, false);
+ loop_write(ttyfd, message, strlen(message), false);
+ loop_write(ttyfd, ": ", 2, false);
+ loop_write(ttyfd, "\x1B[0m", 4, false);
+
+ new_termios = old_termios;
+ new_termios.c_lflag &= ~(ICANON|ECHO);
+ new_termios.c_cc[VMIN] = 1;
+ new_termios.c_cc[VTIME] = 0;
+
+ if (tcsetattr(ttyfd, TCSADRAIN, &new_termios) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ reset_tty = true;
+ }
+
+ zero(pollfd);
+
+ pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO;
+ pollfd[POLL_TTY].events = POLLIN;
+ pollfd[POLL_INOTIFY].fd = notify;
+ pollfd[POLL_INOTIFY].events = POLLIN;
+
+ for (;;) {
+ char c;
+ int sleep_for = -1, k;
+ ssize_t n;
+
+ if (until > 0) {
+ usec_t y;
+
+ y = now(CLOCK_MONOTONIC);
+
+ if (y > until) {
+ r = -ETIMEDOUT;
+ goto finish;
+ }
+
+ sleep_for = (int) ((until - y) / USEC_PER_MSEC);
+ }
+
+ if (flag_file)
+ if (access(flag_file, F_OK) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if ((k = poll(pollfd, notify > 0 ? 2 : 1, sleep_for)) < 0) {
+
+ if (errno == EINTR)
+ continue;
+
+ r = -errno;
+ goto finish;
+ } else if (k == 0) {
+ r = -ETIMEDOUT;
+ goto finish;
+ }
+
+ if (notify > 0 && pollfd[POLL_INOTIFY].revents != 0)
+ flush_fd(notify);
+
+ if (pollfd[POLL_TTY].revents == 0)
+ continue;
+
+ if ((n = read(ttyfd >= 0 ? ttyfd : STDIN_FILENO, &c, 1)) < 0) {
+
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
+
+ r = -errno;
+ goto finish;
+
+ } else if (n == 0)
+ break;
+
+ if (c == '\n')
+ break;
+ else if (c == 21) {
+
+ while (p > 0) {
+ p--;
+
+ if (ttyfd >= 0)
+ loop_write(ttyfd, "\b \b", 3, false);
+ }
+
+ } else if (c == '\b' || c == 127) {
+ if (p > 0) {
+ p--;
+
+ if (ttyfd >= 0)
+ loop_write(ttyfd, "\b \b", 3, false);
+ }
+ } else {
+ passphrase[p++] = c;
+
+ if (ttyfd >= 0)
+ loop_write(ttyfd, "*", 1, false);
+ }
+ }
+
+ if (ttyfd >= 0)
+ loop_write(ttyfd, "\n", 1, false);
+
+ passphrase[p] = 0;
+
+ if (!(*_passphrase = strdup(passphrase))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ r = 0;
+
+finish:
+ if (notify >= 0)
+ close_nointr_nofail(notify);
+
+ if (ttyfd >= 0) {
+ if (reset_tty)
+ tcsetattr(ttyfd, TCSADRAIN, &old_termios);
+
+ close_nointr_nofail(ttyfd);
+ }
+
+ return r;
+}
+
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",
diff --git a/src/util.h b/src/util.h
index b257ee5..6a252ab 100644
--- a/src/util.h
+++ b/src/util.h
@@ -364,6 +364,8 @@ bool null_or_empty(struct stat *st);
DIR *xopendirat(int dirfd, const char *name);
+int ask_password_tty(const char *message, usec_t until, const char *flag_file, char **_passphrase);
+
#define NULSTR_FOREACH(i, l) \
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
More information about the systemd-commits
mailing list