From c2758616d8fcf92de139f519e027713f4dc1c937 Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 12 Jan 2015 22:23:36 -0600 Subject: eval_password code is now in cmd_connect so that it can be changed without clearing it. eval_password errors are also now ignored, along with pclosing the popened eval_password. --- src/command/commands.c | 15 ++++++++++++++- src/config/accounts.c | 10 ---------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/command/commands.c b/src/command/commands.c index 3647bb22..2b7136f2 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -130,7 +130,20 @@ cmd_connect(gchar **args, struct cmd_help_t help) ProfAccount *account = accounts_get_account(lower); if (account != NULL) { 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(); } cons_show("Connecting with account %s as %s", account->name, jid); diff --git a/src/config/accounts.c b/src/config/accounts.c index 01609888..d86fe3af 100644 --- a/src/config/accounts.c +++ b/src/config/accounts.c @@ -226,16 +226,6 @@ 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 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); gchar *server = g_key_file_get_string(accounts, name, "server", NULL); -- cgit 1.4.1-2-gfad0 From b6536ddf88f1261f8a799e52aa0db020334489f4 Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 12 Jan 2015 22:39:12 -0600 Subject: fix tests --- src/command/commands.c | 2 +- tests/test_cmd_rooms.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/command/commands.c b/src/command/commands.c index 2b7136f2..b1a829b5 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -137,7 +137,7 @@ cmd_connect(gchar **args, struct cmd_help_t help) 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); + account->password = fgets(account->password, READ_BUF_SIZE, stream); pclose(stream); } else { log_error("popen failed when running eval_password."); diff --git a/tests/test_cmd_rooms.c b/tests/test_cmd_rooms.c index 9b99a34a..5114bfbf 100644 --- a/tests/test_cmd_rooms.c +++ b/tests/test_cmd_rooms.c @@ -61,6 +61,7 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state) account->name = NULL; account->jid = NULL; account->password = NULL; + account->eval_password = NULL; account->resource = NULL; account->server = NULL; account->last_presence = NULL; -- cgit 1.4.1-2-gfad0 From b1f79b9d35a7d9b1ce2f782714020f14ce78b561 Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 12 Jan 2015 22:51:00 -0600 Subject: add a memory check just in case --- src/command/commands.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/command/commands.c b/src/command/commands.c index b1a829b5..d6a8af2f 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -137,6 +137,10 @@ cmd_connect(gchar **args, struct cmd_help_t help) 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); + if(!account->password){ + log_error("Failed to allocate enough memory to read eval_password output"); + return TRUE; + } account->password = fgets(account->password, READ_BUF_SIZE, stream); pclose(stream); } else { -- cgit 1.4.1-2-gfad0 From 12642656917ed3d33e1a82683c09d2136b8b01b1 Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 12 Jan 2015 23:00:03 -0600 Subject: fix a potential leak --- src/command/commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/command/commands.c b/src/command/commands.c index d6a8af2f..2f61b6fa 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -84,7 +84,6 @@ gboolean cmd_connect(gchar **args, struct cmd_help_t help) { gboolean result = FALSE; - char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT); jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -94,6 +93,7 @@ cmd_connect(gchar **args, struct cmd_help_t help) } else { gchar *opt_keys[] = { "server", "port", NULL }; gboolean parsed; + char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT); GHashTable *options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed); if (!parsed) { @@ -124,6 +124,8 @@ cmd_connect(gchar **args, struct cmd_help_t help) return TRUE; } } + g_free(def); + char *lower = g_utf8_strdown(user, -1); char *jid; @@ -176,8 +178,6 @@ cmd_connect(gchar **args, struct cmd_help_t help) result = TRUE; } - g_free(def); - return result; } -- cgit 1.4.1-2-gfad0