Add support for evaluated password
This commit is contained in:
@@ -60,6 +60,7 @@ static gchar *string_keys[] = {
|
||||
"port",
|
||||
"resource",
|
||||
"password",
|
||||
"eval_password",
|
||||
"presence.last",
|
||||
"presence.login",
|
||||
"muc.service",
|
||||
@@ -224,6 +225,14 @@ accounts_get_account(const char * const name)
|
||||
}
|
||||
|
||||
gchar *password = g_key_file_get_string(accounts, name, "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 100 bytes to prevent overflows in the case of a poorly chosen command
|
||||
password = g_malloc(100);
|
||||
fgets(password, 100, stream);
|
||||
}
|
||||
gboolean enabled = g_key_file_get_boolean(accounts, name, "enabled", NULL);
|
||||
|
||||
gchar *server = g_key_file_get_string(accounts, name, "server", NULL);
|
||||
@@ -278,7 +287,7 @@ accounts_get_account(const char * const name)
|
||||
g_strfreev(always);
|
||||
}
|
||||
|
||||
ProfAccount *new_account = account_new(name, jid, password, enabled,
|
||||
ProfAccount *new_account = account_new(name, jid, password, eval_password, enabled,
|
||||
server, port, resource, last_presence, login_presence,
|
||||
priority_online, priority_chat, priority_away, priority_xa,
|
||||
priority_dnd, muc_service, muc_nick, otr_policy, otr_manual,
|
||||
@@ -286,6 +295,7 @@ accounts_get_account(const char * const name)
|
||||
|
||||
g_free(jid);
|
||||
g_free(password);
|
||||
g_free(eval_password);
|
||||
g_free(server);
|
||||
g_free(resource);
|
||||
g_free(last_presence);
|
||||
@@ -441,6 +451,15 @@ accounts_set_password(const char * const account_name, const char * const value)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
accounts_set_eval_password(const char * const account_name, const char * const value)
|
||||
{
|
||||
if (accounts_account_exists(account_name)) {
|
||||
g_key_file_set_string(accounts, account_name, "eval_password", value);
|
||||
_save_accounts();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
accounts_clear_password(const char * const account_name)
|
||||
{
|
||||
@@ -450,6 +469,15 @@ accounts_clear_password(const char * const account_name)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
accounts_clear_eval_password(const char * const account_name)
|
||||
{
|
||||
if (accounts_account_exists(account_name)) {
|
||||
g_key_file_remove_key(accounts, account_name, "eval_password", NULL);
|
||||
_save_accounts();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
accounts_clear_server(const char * const account_name)
|
||||
{
|
||||
@@ -859,4 +887,4 @@ _get_accounts_file(void)
|
||||
g_string_free(logfile, TRUE);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user