aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Use popen for eval_password (reintroduce old behavior)

Browse Source 
Old commit that implemented the old behavior:
bc9e6b79cdc246f7e97f6ddff7ea81474a698b05
This commit is contained in:
William Wennerström 2020-12-13 17:19:40 +01:00
parent 32cfea4bd2
commit 695a1d3c8c
No known key found for this signature in database
GPG Key ID: E1382990BEDD319B
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/config/account.c
View File

@ -36,6 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <glib.h> #include <glib.h>
@ -200,35 +201,49 @@ account_eval_password(ProfAccount* account)
assert(account != NULL); assert(account != NULL);
assert(account->eval_password != NULL); assert(account->eval_password != NULL);
gchar* std_out = NULL; errno = 0;
gchar* std_err = NULL;
gchar* argv[] = { "sh", "-c", account->eval_password, NULL }; FILE* stream = popen(account->eval_password, "r");
if (!call_external(argv, &std_out, &std_err)) { if (stream == NULL) {
log_error("Password command failed with: %s", std_err); const char* errmsg = strerror(errno);
g_free(std_out); if (errmsg) {
g_free(std_err); log_error("Could not execute `eval_password` command (%s).",
errmsg);
} else {
log_error("Failed to allocate memory for `eval_password` command.");
}
return FALSE; return FALSE;
} }
if (!std_out || !std_out[0]) { account->password = g_malloc(READ_BUF_SIZE);
log_error("Password command returned empty output.");
g_free(std_out);
g_free(std_err);
return FALSE;
}
// Remove leading and trailing whitespace from command output.
gchar* password = g_strdup(std_out);
g_strstrip(password);
account->password = password;
g_free(std_out);
g_free(std_err);
if (!account->password) { if (!account->password) {
log_error("Failed to allocate enough memory to read password command " log_error("Failed to allocate enough memory to read `eval_password` "
"output"); "output.");
return FALSE;
}
account->password = fgets(account->password, READ_BUF_SIZE, stream);
if (!account->password) {
log_error("Failed to read password from stream.");
return FALSE;
}
int exit_status = pclose(stream);
if (exit_status > 0) {
log_error("Command for `eval_password` returned error status (%s).",
exit_status);
return FALSE;
} else if (exit_status < 0) {
log_error("Failed to close stream for `eval_password` command output "
"(%s).",
strerror(errno));
return FALSE;
};
// Remove leading and trailing whitespace from output.
g_strstrip(account->password);
if (!account->password) {
log_error("Empty password returned by `eval_password` command.");
return FALSE; return FALSE;
} }