aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

eval_password code is now in cmd_connect so that it can be changed

Browse Source 
without clearing it. eval_password errors are also now ignored, along
with pclosing the popened eval_password.
This commit is contained in:
Will Song 2015-01-12 22:23:36 -06:00
parent 844cd2dda7
commit c2758616d8
No known key found for this signature in database
GPG Key ID: AF0CA153EA5D9C7C
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/command/commands.c
View File

@ -130,7 +130,20 @@ cmd_connect(gchar **args, struct cmd_help_t help)
ProfAccount *account = accounts_get_account(lower); ProfAccount *account = accounts_get_account(lower);
if (account != NULL) { if (account != NULL) {
jid = account_create_full_jid(account); jid = account_create_full_jid(account);
if (account->password == NULL && account->eval_password == NULL) { if(account->eval_password){
// Evaluate as shell command to retrieve password
GString *cmd = g_string_append(g_string_new(account->eval_password), " 2>/dev/null");
FILE *stream = popen(cmd->str, "r");
if(stream){
// Limit to READ_BUF_SIZE bytes to prevent overflows in the case of a poorly chosen command
account->password = g_malloc(READ_BUF_SIZE);
fgets(account->password, READ_BUF_SIZE, stream);
pclose(stream);
} else {
log_error("popen failed when running eval_password.");
}
g_string_free(cmd, TRUE);
} else if (!account->password) {
account->password = ui_ask_password(); account->password = ui_ask_password();
} }
cons_show("Connecting with account %s as %s", account->name, jid); cons_show("Connecting with account %s as %s", account->name, jid);

10
src/config/accounts.c
View File

@ -226,16 +226,6 @@ accounts_get_account(const char * const name)
gchar *password = g_key_file_get_string(accounts, name, "password", NULL); gchar *password = g_key_file_get_string(accounts, name, "password", NULL);
gchar *eval_password = g_key_file_get_string(accounts, name, "eval_password", NULL); gchar *eval_password = g_key_file_get_string(accounts, name, "eval_password", NULL);
// Evaluate as shell command to retrieve password
if (eval_password != NULL) {
FILE *stream = popen(eval_password, "r");
// Limit to READ_BUF_SIZE bytes to prevent overflows in the case of a poorly chosen command
password = g_malloc(READ_BUF_SIZE);
gchar *result = fgets(password, READ_BUF_SIZE, stream);
if (result != NULL) {
password = result;
}
}
gboolean enabled = g_key_file_get_boolean(accounts, name, "enabled", NULL); gboolean enabled = g_key_file_get_boolean(accounts, name, "enabled", NULL);
gchar *server = g_key_file_get_string(accounts, name, "server", NULL); gchar *server = g_key_file_get_string(accounts, name, "server", NULL);