ask-password: add minimal plymouth password agent

diff --git a/TODO b/TODO
index 938ee49abaa504d881f511a33c1c0079159f817f..f1e63129677d8e47631477fde4a9e9444ff00d69 100644 (file)
--- a/TODO
+++ b/TODO
@@ -58,8 +58,6 @@
 * start getty 2-6 only when actual vt switch happens
   (same model as socket on-demand activation)
 
 * start getty 2-6 only when actual vt switch happens
   (same model as socket on-demand activation)
 

-* ask-password plymouth agent
-

 * spawn ask-password tty agent temporarily in systemctl
 
 * readahead: btrfs/LVM SSD detection
 * spawn ask-password tty agent temporarily in systemctl
 
 * readahead: btrfs/LVM SSD detection


@@ -84,6 +82,8 @@
 
 * make description of .swap files nicer: resolve /dev/by-uuid/ symlink
 
 
 * make description of .swap files nicer: resolve /dev/by-uuid/ symlink
 

+* systemctl status getty@tty1.service
+

 External:
 
 * patch kernel to add /proc/swaps change notifications
 External:
 
 * patch kernel to add /proc/swaps change notifications

diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c
index 9c4d076b31ccbd3f74899297e88aafbe4c8e7882..8a9330d4acbbc09d7929df14a09270d913328ffb 100644 (file)
--- a/src/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent.c
@@ -33,6 +33,7 @@
 #include "util.h"
 #include "conf-parser.h"
 #include "utmp-wtmp.h"
 #include "util.h"
 #include "conf-parser.h"
 #include "utmp-wtmp.h"

+#include "socket-util.h"

 
 static enum {
         ACTION_LIST,
 
 static enum {
         ACTION_LIST,


@@ -41,6 +42,164 @@ static enum {
         ACTION_WALL
 } arg_action = ACTION_QUERY;
 
         ACTION_WALL
 } arg_action = ACTION_QUERY;
 

+static bool arg_plymouth = false;
+
+static int ask_password_plymouth(const char *message, usec_t until, const char *flag_file, char **_passphrase) {
+        int fd = -1, notify = -1;
+        union sockaddr_union sa;
+        char *packet = NULL;
+        ssize_t k;
+        int r, n;
+        struct pollfd pollfd[2];
+        char buffer[LINE_MAX];
+        size_t p = 0;
+        enum {
+                POLL_SOCKET,
+                POLL_INOTIFY
+        };
+
+        if (flag_file) {
+                if ((notify = inotify_init1(IN_CLOEXEC|IN_NONBLOCK)) < 0) {
+                        r = -errno;
+                        goto finish;
+                }
+
+                if (inotify_add_watch(notify, flag_file, IN_ATTRIB /* for the link count */) < 0) {
+                        r = -errno;
+                        goto finish;
+                }
+        }
+
+        if ((fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0)) < 0) {
+                r = -errno;
+                goto finish;
+        }
+
+        zero(sa);
+        sa.sa.sa_family = AF_UNIX;
+        strncpy(sa.un.sun_path+1, "/ply-boot-protocol", sizeof(sa.un.sun_path)-1);
+
+        if (connect(fd, &sa.sa, sizeof(sa.un)) < 0) {
+                r = -errno;
+                goto finish;
+        }
+
+        if (asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), message, &n) < 0) {
+                r = -ENOMEM;
+                goto finish;
+        }
+
+        if ((k = loop_write(fd, packet, n+1, true)) != n+1) {
+                r = k < 0 ? (int) k : -EIO;
+                goto finish;
+        }
+
+        zero(pollfd);
+        pollfd[POLL_SOCKET].fd = fd;
+        pollfd[POLL_SOCKET].events = POLLIN;
+        pollfd[POLL_INOTIFY].fd = notify;
+        pollfd[POLL_INOTIFY].events = POLLIN;
+
+        for (;;) {
+                int sleep_for = -1, j;
+
+                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 ((j = poll(pollfd, notify > 0 ? 2 : 1, sleep_for)) < 0) {
+
+                        if (errno == EINTR)
+                                continue;
+
+                        r = -errno;
+                        goto finish;
+                } else if (j == 0) {
+                        r = -ETIMEDOUT;
+                        goto finish;
+                }
+
+                if (notify > 0 && pollfd[POLL_INOTIFY].revents != 0)
+                        flush_fd(notify);
+
+                if (pollfd[POLL_SOCKET].revents == 0)
+                        continue;
+
+                if ((k = read(fd, buffer + p, sizeof(buffer) - p)) <= 0) {
+                        r = k < 0 ? -errno : -EIO;
+                        goto finish;
+                }
+
+                p += k;
+
+                if (p < 1)
+                        continue;
+
+                if (buffer[0] == 5) {
+                        /* No password, because UI not shown */
+                        r = -ENOENT;
+                        goto finish;
+
+                } else if (buffer[0] == 2) {
+                        uint32_t size;
+                        char *s;
+
+                        /* One answer */
+                        if (p < 5)
+                                continue;
+
+                        memcpy(&size, buffer+1, sizeof(size));
+                        if (size+5 > sizeof(buffer)) {
+                                r = -EIO;
+                                goto finish;
+                        }
+
+                        if (p-5 < size)
+                                continue;
+
+                        if (!(s = strndup(buffer + 5, size))) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+
+                        *_passphrase = s;
+                        break;
+                } else {
+                        /* Unknown packet */
+                        r = -EIO;
+                        goto finish;
+                }
+        }
+
+        r = 0;
+
+finish:
+        if (notify >= 0)
+                close_nointr_nofail(notify);
+
+        if (fd >= 0)
+                close_nointr_nofail(fd);
+
+        free(packet);
+
+        return r;
+}
+

 static int parse_password(const char *filename) {
         char *socket_name = NULL, *message = NULL, *packet = NULL;
         uint64_t not_after = 0;
 static int parse_password(const char *filename) {
         char *socket_name = NULL, *message = NULL, *packet = NULL;
         uint64_t not_after = 0;


@@ -122,8 +281,13 @@ static int parse_password(const char *filename) {
                         goto finish;
                 }
 
                         goto finish;
                 }
 

-                if ((r = ask_password_tty(message, not_after, filename, &password)) < 0) {
-                        log_error("Failed to query passwords: %s", strerror(-r));
+                if (arg_plymouth)
+                        r = ask_password_plymouth(message, not_after, filename, &password);
+                else
+                        r = ask_password_tty(message, not_after, filename, &password);
+
+                if (r < 0) {
+                        log_error("Failed to query password: %s", strerror(-r));

                         goto finish;
                 }
 
                         goto finish;
                 }
 


@@ -262,11 +426,12 @@ static int help(void) {
 
         printf("%s [OPTIONS...]\n\n"
                "Process system password requests.\n\n"
 
         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",
+               "  -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"
+               "     --plymouth Ask question with Plymouth instead of on TTY\n",

                program_invocation_short_name);
 
         return 0;
                program_invocation_short_name);
 
         return 0;


@@ -279,15 +444,17 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_QUERY,
                 ARG_WATCH,
                 ARG_WALL,
                 ARG_QUERY,
                 ARG_WATCH,
                 ARG_WALL,

+                ARG_PLYMOUTH

         };
 
         static const struct option options[] = {
         };
 
         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         }
+                { "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     },
+                { "plymouth", no_argument, NULL, ARG_PLYMOUTH },
+                { NULL,    0,           NULL, 0               }

         };
 
         int c;
         };
 
         int c;


@@ -319,6 +486,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_action = ACTION_WALL;
                         break;
 
                         arg_action = ACTION_WALL;
                         break;
 

+                case ARG_PLYMOUTH:
+                        arg_plymouth = true;
+                        break;
+

                 case '?':
                         return -EINVAL;
 
                 case '?':
                         return -EINVAL;
 

diff --git a/src/util.c b/src/util.c
index 973cee15e31a2d55fc49be2f2a9366d449f8a039..f5ee29897f519d39071dd665ae650640025b6d3d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3380,7 +3380,7 @@ int ask_password_tty(const char *message, usec_t until, const char *flag_file, c
         assert(_passphrase);
 
         if (flag_file) {
         assert(_passphrase);
 
         if (flag_file) {

-                if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
+                if ((notify = inotify_init1(IN_CLOEXEC|IN_NONBLOCK)) < 0) {

                         r = -errno;
                         goto finish;
                 }
                         r = -errno;
                         goto finish;
                 }