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

Added some otr policy functionality, if policy is set to "always"

Browse Source 
if otr_is_secure fails, the message will not be sent.

Changed both cmd_msg and cmd_execute_default
This commit is contained in:
lightb
2014-04-19 05:08:33 -04:00
parent a687e3f6b4
commit 1ceca89296
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/command.c
View File

@@ -1328,6 +1328,10 @@ cmd_execute_default(const char * const inp)
ui_current_print_line("You are not currently connected."); ui_current_print_line("You are not currently connected.");
} else { } else {
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
if ((strcmp(prefs_get_string(PREF_OTR_POLICY), "always") == 0) && !otr_is_secure(recipient)) {
cons_show_error("Failed to send message. Please check OTR policy");
return TRUE;
}
if (otr_is_secure(recipient)) { if (otr_is_secure(recipient)) {
char *encrypted = otr_encrypt_message(recipient, inp); char *encrypted = otr_encrypt_message(recipient, inp);
if (encrypted != NULL) { if (encrypted != NULL) {

4
src/command/commands.c
View File

@@ -946,6 +946,10 @@ cmd_msg(gchar **args, struct cmd_help_t help)
} }
if (msg != NULL) { if (msg != NULL) {
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
if ((strcmp(prefs_get_string(PREF_OTR_POLICY), "always") == 0) && !otr_is_secure(usr_jid)) {
cons_show_error("Failed to send message. Please check OTR policy");
return TRUE;
}
if (otr_is_secure(usr_jid)) { if (otr_is_secure(usr_jid)) {
char *encrypted = otr_encrypt_message(usr_jid, msg); char *encrypted = otr_encrypt_message(usr_jid, msg);
if (encrypted != NULL) { if (encrypted != NULL) {

1
src/xmpp/message.c
View File

@@ -522,4 +522,3 @@ message_init_module(void)
message_send_inactive = _message_send_inactive; message_send_inactive = _message_send_inactive;
message_send_gone = _message_send_gone; message_send_gone = _message_send_gone;
} }