#include <sys/inotify.h>
#include <unistd.h>
#include <getopt.h>
+#include <sys/signalfd.h>
+#include <fcntl.h>
#include "util.h"
#include "conf-parser.h"
#include "utmp-wtmp.h"
#include "socket-util.h"
+#include "ask-password-api.h"
static enum {
ACTION_LIST,
{ "NotAfter", config_parse_uint64, ¬_after, "Ask" },
{ "Message", config_parse_string, &message, "Ask" },
{ "PID", config_parse_unsigned, &pid, "Ask" },
+ { NULL, NULL, NULL, NULL }
};
FILE *f;
return -errno;
}
- if ((r = config_parse(filename, f, NULL, items, false, NULL)) < 0) {
+ if ((r = config_parse(filename, f, NULL, items, true, NULL)) < 0) {
log_error("Failed to parse password file %s: %s", filename, strerror(-r));
goto finish;
}
if (asprintf(&_wall,
"%s%sPassword entry required for \'%s\' (PID %u).\r\n"
- "Please enter password with the systemd-tty-password-agent tool!",
+ "Please enter password with the systemd-tty-ask-password-agent tool!",
*wall ? *wall : "",
*wall ? "\r\n\r\n" : "",
message,
return r;
}
+static int tty_block(void) {
+ char *p;
+ const char *t;
+ int fd;
+
+ if (!(t = ttyname(STDIN_FILENO)))
+ return -errno;
+
+ if (asprintf(&p, "/dev/.systemd/ask-password-block/%s", file_name_from_path(t)) < 0)
+ return -ENOMEM;
+
+ mkdir_parents(p, 0700);
+ mkfifo(p, 0600);
+
+ fd = open(p, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
+ free(p);
+
+ if (fd < 0)
+ return -errno;
+
+ return fd;
+}
+
+static bool tty_match(const char *path) {
+ int fd;
+ char *p;
+
+ /* We use named pipes to ensure that wall messages suggesting
+ * password entry are not printed over password prompts
+ * already shown. We use the fact here that opening a pipe in
+ * non-blocking mode for write-only will succeed only if
+ * there's some writer behind it. Using pipes has the
+ * advantage that the block will automatically go away if the
+ * process dies. */
+
+ if (asprintf(&p, "/dev/.systemd/ask-password-block/%s", file_name_from_path(path)) < 0)
+ return true;
+
+ fd = open(p, O_WRONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
+ free(p);
+
+ if (fd < 0)
+ return true;
+
+ /* What, we managed to open the pipe? Then this tty is filtered. */
+ close_nointr_nofail(fd);
+ return false;
+}
+
static int show_passwords(void) {
DIR *d;
struct dirent *de;
free(p);
if (wall) {
- utmp_wall(wall);
+ utmp_wall(wall, tty_match);
free(wall);
}
}
}
static int watch_passwords(void) {
- int notify;
- struct pollfd pollfd;
+ enum {
+ FD_INOTIFY,
+ FD_SIGNAL,
+ _FD_MAX
+ };
+
+ int notify = -1, signal_fd = -1, tty_block_fd = -1;
+ struct pollfd pollfd[_FD_MAX];
+ sigset_t mask;
int r;
+ tty_block_fd = tty_block();
+
mkdir_p("/dev/.systemd/ask-password", 0755);
if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
goto finish;
}
+ assert_se(sigemptyset(&mask) == 0);
+ sigset_add_many(&mask, SIGINT, SIGTERM, -1);
+ assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+
+ if ((signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) {
+ log_error("signalfd(): %m");
+ r = -errno;
+ goto finish;
+ }
+
zero(pollfd);
- pollfd.fd = notify;
- pollfd.events = POLLIN;
+ pollfd[FD_INOTIFY].fd = notify;
+ pollfd[FD_INOTIFY].events = POLLIN;
+ pollfd[FD_SIGNAL].fd = signal_fd;
+ pollfd[FD_SIGNAL].events = POLLIN;
for (;;) {
if ((r = show_passwords()) < 0)
break;
- if (poll(&pollfd, 1, -1) < 0) {
+ if (poll(pollfd, _FD_MAX, -1) < 0) {
if (errno == EINTR)
continue;
goto finish;
}
- if (pollfd.revents != 0)
+ if (pollfd[FD_INOTIFY].revents != 0)
flush_fd(notify);
+
+ if (pollfd[FD_SIGNAL].revents != 0)
+ break;
}
r = 0;
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);
+
return r;
}