morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

ask-password-agent: optionally read pw to reply from env var

Browse Source
This commit is contained in:
Lennart Poettering
2024-11-06 23:38:01 +01:00
parent 1a2e4b614e
commit 49187cfc34
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@@ -243,20 +243,28 @@ static int process_one_password_file(const char *filename, FILE *f) {
SET_FLAG(flags, ASK_PASSWORD_ECHO, echo);
SET_FLAG(flags, ASK_PASSWORD_SILENT, silent);
if (arg_plymouth) {
AskPasswordRequest req = {
.message = message,
};
/* Allow providing a password via env var, for debugging purposes */
const char *e = secure_getenv("SYSTEMD_ASK_PASSWORD_AGENT_PASSWORD");
if (e) {
passwords = strv_new(e);
if (!passwords)
return log_oom();
} else {
if (arg_plymouth) {
AskPasswordRequest req = {
.message = message,
};
r = ask_password_plymouth(&req, not_after, flags, filename, &passwords);
} else
r = agent_ask_password_tty(message, not_after, flags, filename, &passwords);
if (r < 0) {
/* If the query went away, that's OK */
if (IN_SET(r, -ETIME, -ENOENT))
return 0;
r = ask_password_plymouth(&req, not_after, flags, filename, &passwords);
} else
r = agent_ask_password_tty(message, not_after, flags, filename, &passwords);
if (r < 0) {
/* If the query went away, that's OK */
if (IN_SET(r, -ETIME, -ENOENT))
return 0;
return log_error_errno(r, "Failed to query password: %m");
return log_error_errno(r, "Failed to query password: %m");
}
}
assert(!strv_isempty(passwords));