devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Force tls on all connections, add tls policy account property

Browse Source
This commit is contained in:
James Booth
2015-10-18 03:06:23 +01:00
parent 9d2745e462
commit 6640a0891f
19 changed files with 190 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/config/accounts.c
View File

@@ -120,7 +120,7 @@ accounts_reset_enabled_search(void)
}
void
accounts_add(const char *account_name, const char *altdomain, const int port)
accounts_add(const char *account_name, const char *altdomain, const int port, const char *const tls_policy)
{
// set account name and resource
const char *barejid = account_name;
@@ -144,6 +144,9 @@ accounts_add(const char *account_name, const char *altdomain, const int port)
if (port != 0) {
g_key_file_set_integer(accounts, account_name, "port", port);
}
if (tls_policy) {
g_key_file_set_string(accounts, account_name, "tls.policy", tls_policy);
}
Jid *jidp = jid_create(barejid);
GString *muc_service = g_string_new("conference.");
@@ -269,11 +272,19 @@ accounts_get_account(const char * const name)
startscript = g_key_file_get_string(accounts, name, "script.start", NULL);
}
gchar *tls_policy = g_key_file_get_string(accounts, name, "tls.policy", NULL);
if (tls_policy && ((g_strcmp0(tls_policy, "force") != 0) &&
(g_strcmp0(tls_policy, "allow") != 0) &&
(g_strcmp0(tls_policy, "disable") != 0))) {
g_free(tls_policy);
tls_policy = NULL;
}
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,
otr_opportunistic, otr_always, pgp_keyid, startscript);
otr_opportunistic, otr_always, pgp_keyid, startscript, tls_policy);
g_free(jid);
g_free(password);
@@ -287,6 +298,7 @@ accounts_get_account(const char * const name)
g_free(otr_policy);
g_free(pgp_keyid);
g_free(startscript);
g_free(tls_policy);
return new_account;
}
@@ -354,7 +366,8 @@ accounts_rename(const char * const account_name, const char * const new_name)
"otr.always",
"pgp.keyid",
"last.activity",
"script.start"
"script.start",
"tls.policy"
};
int i;
@@ -678,6 +691,15 @@ accounts_set_otr_policy(const char * const account_name, const char * const valu
}
}
void
accounts_set_tls_policy(const char * const account_name, const char * const value)
{
if (accounts_account_exists(account_name)) {
g_key_file_set_string(accounts, account_name, "tls.policy", value);
_save_accounts();
}
}
void
accounts_set_priority_online(const char * const account_name, const gint value)
{