X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fask-password-api.c;h=3941605ceceda64730943f5dcee30f49af84ef32;hb=b733fbe7a0214eb43e402db7179697bf9c0975c1;hp=8d03f4ad0994f001a5c1a6a246ac01f56e350064;hpb=6b9732b2bf0499c5e4ea8a9d4f6051d98033f680;p=elogind.git

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 8d03f4ad0..3941605ce 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -32,9 +32,12 @@
 #include <sys/signalfd.h>
 
 #include "util.h"
+#include "formats-util.h"
 #include "mkdir.h"
 #include "strv.h"
-
+#include "random-util.h"
+#include "terminal-util.h"
+#include "signal-util.h"
 #include "ask-password-api.h"
 
 static void backspace_chars(int ttyfd, size_t p) {
@@ -52,6 +55,7 @@ static void backspace_chars(int ttyfd, size_t p) {
 int ask_password_tty(
                 const char *message,
                 usec_t until,
+                bool echo,
                 const char *flag_file,
                 char **_passphrase) {
 
@@ -218,7 +222,7 @@ int ask_password_tty(
                         passphrase[p++] = c;
 
                         if (!silent_mode && ttyfd >= 0)
-                                loop_write(ttyfd, "*", 1, false);
+                                loop_write(ttyfd, echo ? &c : "*", 1, false);
 
                         dirty = true;
                 }
@@ -257,10 +261,8 @@ static int create_socket(char **name) {
         assert(name);
 
         fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-        if (fd < 0) {
-                log_error("socket() failed: %m");
-                return -errno;
-        }
+        if (fd < 0)
+                return log_error_errno(errno, "socket() failed: %m");
 
         snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%" PRIx64, random_u64());
 
@@ -270,13 +272,13 @@ static int create_socket(char **name) {
 
         if (r < 0) {
                 r = -errno;
-                log_error("bind(%s) failed: %m", sa.un.sun_path);
+                log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
                 goto fail;
         }
 
         if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) {
                 r = -errno;
-                log_error("SO_PASSCRED failed: %m");
+                log_error_errno(errno, "SO_PASSCRED failed: %m");
                 goto fail;
         }
 
@@ -300,6 +302,7 @@ int ask_password_agent(
                 const char *icon,
                 const char *id,
                 usec_t until,
+                bool echo,
                 bool accept_cached,
                 char ***_passphrases) {
 
@@ -320,15 +323,15 @@ int ask_password_agent(
 
         assert(_passphrases);
 
-        assert_se(sigemptyset(&mask) == 0);
-        sigset_add_many(&mask, SIGINT, SIGTERM, -1);
-        assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
+        assert_se(sigemptyset(&mask) >= 0);
+        assert_se(sigset_add_many(&mask, SIGINT, SIGTERM, -1) >= 0);
+        assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) >= 0);
 
         mkdir_p_label("/run/systemd/ask-password", 0755);
 
         fd = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
         if (fd < 0) {
-                log_error("Failed to create password file: %m");
+                log_error_errno(errno, "Failed to create password file: %m");
                 r = -errno;
                 goto finish;
         }
@@ -337,7 +340,7 @@ int ask_password_agent(
 
         f = fdopen(fd, "w");
         if (!f) {
-                log_error("Failed to allocate FILE: %m");
+                log_error_errno(errno, "Failed to allocate FILE: %m");
                 r = -errno;
                 goto finish;
         }
@@ -346,7 +349,7 @@ int ask_password_agent(
 
         signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
         if (signal_fd < 0) {
-                log_error("signalfd(): %m");
+                log_error_errno(errno, "signalfd(): %m");
                 r = -errno;
                 goto finish;
         }
@@ -362,10 +365,12 @@ int ask_password_agent(
                 "PID="PID_FMT"\n"
                 "Socket=%s\n"
                 "AcceptCached=%i\n"
+                "Echo=%i\n"
                 "NotAfter="USEC_FMT"\n",
                 getpid(),
                 socket_name,
                 accept_cached ? 1 : 0,
+                echo ? 1 : 0,
                 until);
 
         if (message)
@@ -380,7 +385,7 @@ int ask_password_agent(
         fflush(f);
 
         if (ferror(f)) {
-                log_error("Failed to write query file: %m");
+                log_error_errno(errno, "Failed to write query file: %m");
                 r = -errno;
                 goto finish;
         }
@@ -392,7 +397,7 @@ int ask_password_agent(
         final[sizeof(final)-9] = 'k';
 
         if (rename(temp, final) < 0) {
-                log_error("Failed to rename query file: %m");
+                log_error_errno(errno, "Failed to rename query file: %m");
                 r = -errno;
                 goto finish;
         }
@@ -429,7 +434,7 @@ int ask_password_agent(
                         if (errno == EINTR)
                                 continue;
 
-                        log_error("poll() failed: %m");
+                        log_error_errno(errno, "poll() failed: %m");
                         r = -errno;
                         goto finish;
                 }
@@ -468,11 +473,13 @@ int ask_password_agent(
                             errno == EINTR)
                                 continue;
 
-                        log_error("recvmsg() failed: %m");
+                        log_error_errno(errno, "recvmsg() failed: %m");
                         r = -errno;
                         goto finish;
                 }
 
+                cmsg_close_all(&msghdr);
+
                 if (n <= 0) {
                         log_error("Message too short");
                         continue;
@@ -550,7 +557,7 @@ int ask_password_auto(const char *message, const char *icon, const char *id,
                 int r;
                 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)
                         return r;
 
@@ -561,5 +568,5 @@ int ask_password_auto(const char *message, const char *icon, const char *id,
                 *_passphrases = l;
                 return r;
         } else
-                return ask_password_agent(message, icon, id, until, accept_cached, _passphrases);
+                return ask_password_agent(message, icon, id, until, false, accept_cached, _passphrases);
 }