devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 21:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for evaluated password

Browse Source
This commit is contained in:
Peter Vilim
2015-01-06 23:00:02 -06:00
parent 99a87a148f
commit 492c548aa6
6 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config/account.c
View File

@@ -43,7 +43,7 @@
ProfAccount*
account_new(const gchar * const name, const gchar * const jid,
const gchar * const password, gboolean enabled, const gchar * const server,
const gchar * const password, const gchar * eval_password, gboolean enabled, const gchar * const server,
int port, const gchar * const resource, const gchar * const last_presence,
const gchar * const login_presence, int priority_online, int priority_chat,
int priority_away, int priority_xa, int priority_dnd,
@@ -67,6 +67,12 @@ account_new(const gchar * const name, const gchar * const jid,
new_account->password = NULL;
}
if (eval_password != NULL) {
new_account->eval_password = strdup(eval_password);
} else {
new_account->eval_password = NULL;
}
new_account->enabled = enabled;
if (server != NULL) {
@@ -168,4 +174,4 @@ account_free(ProfAccount *account)
g_list_free_full(account->otr_always, g_free);
free(account);
}
}
}

3
src/config/account.h
View File

@@ -41,6 +41,7 @@ typedef struct prof_account_t {
gchar *name;
gchar *jid;
gchar *password;
gchar *eval_password;
gchar *resource;
gchar *server;
int port;
@@ -61,7 +62,7 @@ typedef struct prof_account_t {
} ProfAccount;
ProfAccount* account_new(const gchar * const name, const gchar * const jid,
const gchar * const passord, gboolean enabled, const gchar * const server,
const gchar * const passord, const gchar * eval_password, gboolean enabled, const gchar * const server,
int port, const gchar * const resource, const gchar * const last_presence,
const gchar * const login_presence, int priority_online, int priority_chat,
int priority_away, int priority_xa, int priority_dnd,

32
src/config/accounts.c
View File

@@ -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;
}
}

2
src/config/accounts.h
View File

@@ -61,6 +61,7 @@ void accounts_set_server(const char * const account_name, const char * const val
void accounts_set_port(const char * const account_name, const int value);
void accounts_set_resource(const char * const account_name, const char * const value);
void 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);
void accounts_set_muc_service(const char * const account_name, const char * const value);
void accounts_set_muc_nick(const char * const account_name, const char * const value);
void accounts_set_otr_policy(const char * const account_name, const char * const value);
@@ -77,6 +78,7 @@ void accounts_set_priority_all(const char * const account_name, const gint value
gint accounts_get_priority_for_presence_type(const char * const account_name,
resource_presence_t presence_type);
void accounts_clear_password(const char * const account_name);
void accounts_clear_eval_password(const char * const account_name);
void accounts_clear_server(const char * const account_name);
void accounts_clear_port(const char * const account_name);
void accounts_clear_otr(const char * const account_name);