chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: supported plymouth cached passwords
[elogind.git]
/
src
/
ask-password-api.c
diff --git
a/src/ask-password-api.c
b/src/ask-password-api.c
index 9f7023e32847ae14fb40e37f4ca949623738dd5b..cd663ae09ccc5712c7b019d0fafaa7f8676d5cd6 100644
(file)
--- a/
src/ask-password-api.c
+++ b/
src/ask-password-api.c
@@
-32,6
+32,7
@@
#include <sys/signalfd.h>
#include "util.h"
#include <sys/signalfd.h>
#include "util.h"
+#include "strv.h"
#include "ask-password-api.h"
#include "ask-password-api.h"
@@
-251,12
+252,12
@@
fail:
return r;
}
return r;
}
-
int ask_password_agent(
const char *message,
const char *icon,
usec_t until,
int ask_password_agent(
const char *message,
const char *icon,
usec_t until,
- char **_passphrase) {
+ bool accept_cached,
+ char ***_passphrases) {
enum {
FD_SOCKET,
enum {
FD_SOCKET,
@@
-273,6
+274,8
@@
int ask_password_agent(
sigset_t mask;
struct pollfd pollfd[_FD_MAX];
sigset_t mask;
struct pollfd pollfd[_FD_MAX];
+ assert(_passphrases);
+
mkdir_p("/dev/.systemd/ask-password", 0755);
if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
mkdir_p("/dev/.systemd/ask-password", 0755);
if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
@@
-310,9
+313,11
@@
int ask_password_agent(
"[Ask]\n"
"PID=%lu\n"
"Socket=%s\n"
"[Ask]\n"
"PID=%lu\n"
"Socket=%s\n"
+ "AcceptCached=%i\n"
"NotAfter=%llu\n",
(unsigned long) getpid(),
socket_name,
"NotAfter=%llu\n",
(unsigned long) getpid(),
socket_name,
+ accept_cached ? 1 : 0,
(unsigned long long) until);
if (message)
(unsigned long long) until);
if (message)
@@
-384,8
+389,10
@@
int ask_password_agent(
goto finish;
}
goto finish;
}
- if (pollfd[FD_SIGNAL].revents & POLLIN)
- break;
+ if (pollfd[FD_SIGNAL].revents & POLLIN) {
+ r = -EINTR;
+ goto finish;
+ }
if (pollfd[FD_SOCKET].revents != POLLIN) {
log_error("Unexpected poll() event.");
if (pollfd[FD_SOCKET].revents != POLLIN) {
log_error("Unexpected poll() event.");
@@
-395,7
+402,7
@@
int ask_password_agent(
zero(iovec);
iovec.iov_base = passphrase;
zero(iovec);
iovec.iov_base = passphrase;
- iovec.iov_len = sizeof(passphrase)
-1
;
+ iovec.iov_len = sizeof(passphrase);
zero(control);
zero(msghdr);
zero(control);
zero(msghdr);
@@
-435,13
+442,21
@@
int ask_password_agent(
}
if (passphrase[0] == '+') {
}
if (passphrase[0] == '+') {
-
passphrase[n] = 0
;
+
char **l
;
- if (!(
*_passphrase = strdup(passphrase+
1))) {
+ if (!(
l = strv_parse_nulstr(passphrase+1, n-
1))) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}
+ if (strv_length(l) <= 0) {
+ strv_free(l);
+ log_error("Invalid packet");
+ continue;
+ }
+
+ *_passphrases = l;
+
} else if (passphrase[0] == '-') {
r = -ECANCELED;
goto finish;
} else if (passphrase[0] == '-') {
r = -ECANCELED;
goto finish;
@@
-481,12
+496,26
@@
finish:
return r;
}
return r;
}
-int ask_password_auto(const char *message, const char *icon, usec_t until,
char **_passphrase
) {
+int ask_password_auto(const char *message, const char *icon, usec_t until,
bool accept_cached, char ***_passphrases
) {
assert(message);
assert(message);
- assert(_passphrase);
+ assert(_passphrases);
+
+ if (isatty(STDIN_FILENO)) {
+ int r;
+ char *s = NULL, **l = NULL;
+
+ if ((r = ask_password_tty(message, until, NULL, &s)) < 0)
+ return r;
+
+ l = strv_new(s, NULL);
+ free(s);
+
+ if (!l)
+ return -ENOMEM;
+
+ *_passphrases = l;
+ return r;
- if (isatty(STDIN_FILENO))
- return ask_password_tty(message, until, NULL, _passphrase);
- else
- return ask_password_agent(message, icon, until, _passphrase);
+ } else
+ return ask_password_agent(message, icon, until, accept_cached, _passphrases);
}
}