diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/command/cmd_funcs.c | 4 | ||||
-rw-r--r-- | src/config/account.c | 11 | ||||
-rw-r--r-- | src/config/account.h | 7 | ||||
-rw-r--r-- | src/config/accounts.c | 70 | ||||
-rw-r--r-- | src/config/accounts.h | 2 | ||||
-rw-r--r-- | src/ui/chatwin.c | 62 |
6 files changed, 135 insertions, 21 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 57381831..bd025886 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -7475,6 +7475,7 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args) } chatwin->pgp_send = TRUE; + accounts_add_pgp_state(session_get_account_name(), chatwin->barejid, TRUE); win_println(window, THEME_DEFAULT, "!", "PGP encryption enabled."); return TRUE; } @@ -7498,6 +7499,7 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args) } chatwin->pgp_send = FALSE; + accounts_add_pgp_state(session_get_account_name(), chatwin->barejid, FALSE); win_println(window, THEME_DEFAULT, "!", "PGP encryption disabled."); return TRUE; } @@ -7673,6 +7675,7 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args) } chatwin->is_ox = TRUE; + accounts_add_ox_state(session_get_account_name(), chatwin->barejid, TRUE); win_println(window, THEME_DEFAULT, "!", "OX encryption enabled."); return TRUE; } else if (g_strcmp0(args[0], "end") == 0) { @@ -7688,6 +7691,7 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args) win_println(window, THEME_DEFAULT, "!", "No OX session has been started."); } else { chatwin->is_ox = FALSE; + accounts_add_ox_state(session_get_account_name(), chatwin->barejid, FALSE); win_println(window, THEME_DEFAULT, "!", "OX encryption disabled."); } return TRUE; diff --git a/src/config/account.c b/src/config/account.c index d8029052..238c2ef1 100644 --- a/src/config/account.c +++ b/src/config/account.c @@ -57,8 +57,9 @@ account_new(const gchar* const name, const gchar* const jid, const gchar* const muc_service, const gchar* const muc_nick, const gchar* const otr_policy, GList* otr_manual, GList* otr_opportunistic, GList* otr_always, const gchar* const omemo_policy, GList* omemo_enabled, - GList* omemo_disabled, const gchar* const pgp_keyid, const char* const startscript, - const char* const theme, gchar* tls_policy, gchar* auth_policy) + GList* omemo_disabled, GList* ox_enabled, GList* pgp_enabled, + const gchar* const pgp_keyid, const char* const startscript, const char* const theme, + gchar* tls_policy, gchar* auth_policy) { ProfAccount* new_account = malloc(sizeof(ProfAccount)); memset(new_account, 0, sizeof(ProfAccount)); @@ -154,6 +155,10 @@ account_new(const gchar* const name, const gchar* const jid, new_account->omemo_enabled = omemo_enabled; new_account->omemo_disabled = omemo_disabled; + new_account->ox_enabled = ox_enabled; + + new_account->pgp_enabled = pgp_enabled; + if (pgp_keyid != NULL) { new_account->pgp_keyid = strdup(pgp_keyid); } else { @@ -281,6 +286,8 @@ account_free(ProfAccount* account) g_list_free_full(account->otr_always, g_free); g_list_free_full(account->omemo_enabled, g_free); g_list_free_full(account->omemo_disabled, g_free); + g_list_free_full(account->ox_enabled, g_free); + g_list_free_full(account->pgp_enabled, g_free); free(account); } diff --git a/src/config/account.h b/src/config/account.h index dfc7bc12..ce49883e 100644 --- a/src/config/account.h +++ b/src/config/account.h @@ -64,6 +64,8 @@ typedef struct prof_account_t gchar* omemo_policy; GList* omemo_enabled; GList* omemo_disabled; + GList* ox_enabled; + GList* pgp_enabled; gchar* pgp_keyid; gchar* startscript; gchar* theme; @@ -79,8 +81,9 @@ ProfAccount* account_new(const gchar* const name, const gchar* const jid, const gchar* const muc_service, const gchar* const muc_nick, const gchar* const otr_policy, GList* otr_manual, GList* otr_opportunistic, GList* otr_always, const gchar* const omemo_policy, GList* omemo_enabled, - GList* omemo_disabled, const gchar* const pgp_keyid, const char* const startscript, - const char* const theme, gchar* tls_policy, gchar* auth_policy); + GList* omemo_disabled, GList* ox_enabled, GList* pgp_enabled, const gchar* const pgp_keyid, + const char* const startscript, const char* const theme, gchar* tls_policy, + gchar* auth_policy); char* account_create_connect_jid(ProfAccount* account); gboolean account_eval_password(ProfAccount* account); void account_free(ProfAccount* account); diff --git a/src/config/accounts.c b/src/config/accounts.c index 83934012..d99dd10d 100644 --- a/src/config/accounts.c +++ b/src/config/accounts.c @@ -283,21 +283,39 @@ accounts_get_account(const char* const name) } GList* omemo_enabled = NULL; - gchar** enabled_list = g_key_file_get_string_list(accounts, name, "omemo.enabled", &length, NULL); - if (enabled_list) { + gchar** omemo_enabled_list = g_key_file_get_string_list(accounts, name, "omemo.enabled", &length, NULL); + if (omemo_enabled_list) { for (int i = 0; i < length; i++) { - omemo_enabled = g_list_append(omemo_enabled, strdup(enabled_list[i])); + omemo_enabled = g_list_append(omemo_enabled, strdup(omemo_enabled_list[i])); } - g_strfreev(enabled_list); + g_strfreev(omemo_enabled_list); } GList* omemo_disabled = NULL; - gchar** disabled_list = g_key_file_get_string_list(accounts, name, "omemo.disabled", &length, NULL); - if (disabled_list) { + gchar** omemo_disabled_list = g_key_file_get_string_list(accounts, name, "omemo.disabled", &length, NULL); + if (omemo_disabled_list) { for (int i = 0; i < length; i++) { - omemo_disabled = g_list_append(omemo_disabled, strdup(disabled_list[i])); + omemo_disabled = g_list_append(omemo_disabled, strdup(omemo_disabled_list[i])); } - g_strfreev(disabled_list); + g_strfreev(omemo_disabled_list); + } + + GList* ox_enabled = NULL; + gchar** ox_enabled_list = g_key_file_get_string_list(accounts, name, "ox.enabled", &length, NULL); + if (ox_enabled_list) { + for (int i = 0; i < length; i++) { + ox_enabled = g_list_append(ox_enabled, strdup(ox_enabled_list[i])); + } + g_strfreev(ox_enabled_list); + } + + GList* pgp_enabled = NULL; + gchar** pgp_enabled_list = g_key_file_get_string_list(accounts, name, "pgp.enabled", &length, NULL); + if (pgp_enabled_list) { + for (int i = 0; i < length; i++) { + pgp_enabled = g_list_append(pgp_enabled, strdup(pgp_enabled_list[i])); + } + g_strfreev(pgp_enabled_list); } gchar* pgp_keyid = NULL; @@ -328,8 +346,8 @@ accounts_get_account(const char* const name) priority_online, priority_chat, priority_away, priority_xa, priority_dnd, muc_service, muc_nick, otr_policy, otr_manual, otr_opportunistic, otr_always, omemo_policy, omemo_enabled, - omemo_disabled, pgp_keyid, startscript, theme, tls_policy, - auth_policy); + omemo_disabled, ox_enabled, pgp_enabled, pgp_keyid, + startscript, theme, tls_policy, auth_policy); g_free(jid); g_free(password); @@ -415,6 +433,8 @@ accounts_rename(const char* const account_name, const char* const new_name) "omemo.policy", "omemo.enabled", "omemo.disabled", + "ox.enabled", + "pgp.enabled", "pgp.keyid", "last.activity", "script.start", @@ -678,6 +698,36 @@ accounts_add_omemo_state(const char* const account_name, const char* const conta } void +accounts_add_ox_state(const char* const account_name, const char* const contact_jid, gboolean enabled) +{ + if (accounts_account_exists(account_name)) { + if (enabled) { + conf_string_list_add(accounts, account_name, "ox.enabled", contact_jid); + } else { + conf_string_list_remove(accounts, account_name, "ox.enabled", contact_jid); + } + + _save_accounts(); + } +} + +void +accounts_add_pgp_state(const char* const account_name, const char* const contact_jid, gboolean enabled) +{ + if (accounts_account_exists(account_name)) { + if (enabled) { + conf_string_list_add(accounts, account_name, "pgp.enabled", contact_jid); + conf_string_list_remove(accounts, account_name, "pgp.disabled", contact_jid); + } else { + conf_string_list_add(accounts, account_name, "pgp.disabled", contact_jid); + conf_string_list_remove(accounts, account_name, "pgp.enabled", contact_jid); + } + + _save_accounts(); + } +} + +void accounts_clear_omemo_state(const char* const account_name, const char* const contact_jid) { if (accounts_account_exists(account_name)) { diff --git a/src/config/accounts.h b/src/config/accounts.h index d279bbd0..2f594a2f 100644 --- a/src/config/accounts.h +++ b/src/config/accounts.h @@ -100,6 +100,8 @@ void accounts_clear_muc(const char* const account_name); void accounts_clear_resource(const char* const account_name); void accounts_add_otr_policy(const char* const account_name, const char* const contact_jid, const char* const policy); void accounts_add_omemo_state(const char* const account_name, const char* const contact_jid, gboolean enabled); +void accounts_add_ox_state(const char* const account_name, const char* const contact_jid, gboolean enabled); +void accounts_add_pgp_state(const char* const account_name, const char* const contact_jid, gboolean enabled); void accounts_clear_omemo_state(const char* const account_name, const char* const contact_jid); #endif diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index b9fae2af..c7cf8ddb 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -60,6 +60,36 @@ static void _chatwin_history(ProfChatWin* chatwin, const char* const contact_barejid); static void _chatwin_set_last_message(ProfChatWin* chatwin, const char* const id, const char* const message); +gboolean +_pgp_automatic_start(const char* const recipient) +{ + gboolean result = FALSE; + char* account_name = session_get_account_name(); + ProfAccount* account = accounts_get_account(account_name); + + if (g_list_find_custom(account->pgp_enabled, recipient, (GCompareFunc)g_strcmp0)) { + result = TRUE; + } + + account_free(account); + return result; +} + +gboolean +_ox_automatic_start(const char* const recipient) +{ + gboolean result = FALSE; + char* account_name = session_get_account_name(); + ProfAccount* account = accounts_get_account(account_name); + + if (g_list_find_custom(account->ox_enabled, recipient, (GCompareFunc)g_strcmp0)) { + result = TRUE; + } + + account_free(account); + return result; +} + ProfChatWin* chatwin_new(const char* const barejid) { @@ -82,20 +112,38 @@ chatwin_new(const char* const barejid) // We start a new OMEMO session if this contact has been configured accordingly. // However, if OTR is *also* configured, ask the user to choose between OMEMO and OTR. -#ifdef HAVE_OMEMO + + gboolean is_ox_secure = FALSE; gboolean is_otr_secure = FALSE; + gboolean is_omemo_secure = FALSE; +#ifdef HAVE_LIBGPGME + is_ox_secure = _ox_automatic_start(barejid); +#endif + +#ifdef HAVE_OMEMO + is_omemo_secure = omemo_automatic_start(barejid); +#endif + #ifdef HAVE_LIBOTR is_otr_secure = otr_is_secure(barejid); -#endif // HAVE_LIBOTR - if (omemo_automatic_start(barejid) && is_otr_secure) { - win_println(window, THEME_DEFAULT, "!", "This chat could be either OMEMO or OTR encrypted, but not both. " - "Use '/omemo start' or '/otr start' to select the encryption method."); - } else if (omemo_automatic_start(barejid)) { +#endif + + if (is_omemo_secure + is_otr_secure + _pgp_automatic_start(barejid) + is_ox_secure > 1) { + win_println(window, THEME_DEFAULT, "!", "This chat could be either OMEMO, PGP, OX or OTR encrypted, but not more than one. " + "Use '/omemo start', '/pgp start', '/ox start' or '/otr start' to select the encryption method."); + } else if (is_omemo_secure) { +#ifdef HAVE_OMEMO // Start the OMEMO session omemo_start_session(barejid); chatwin->is_omemo = TRUE; +#endif + } else if (_pgp_automatic_start(barejid)) { + // Start the PGP session + chatwin->pgp_send = TRUE; + } else if (is_ox_secure) { + // Start the OX session + chatwin->is_ox = TRUE; } -#endif // HAVE_OMEMO if (prefs_get_boolean(PREF_MAM)) { iq_mam_request(chatwin); |