diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/command.c | 52 | ||||
| -rw-r--r-- | src/otr.c | 260 | ||||
| -rw-r--r-- | src/otr.h | 33 | ||||
| -rw-r--r-- | src/profanity.c | 5 |
4 files changed, 349 insertions, 1 deletions
diff --git a/src/command/command.c b/src/command/command.c index f7737464..3828ddcf 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -39,6 +39,7 @@ #include "jid.h" #include "log.h" #include "muc.h" +#include "otr.h" #include "profanity.h" #include "tools/autocomplete.h" #include "tools/parser.h" @@ -128,6 +129,7 @@ static gboolean _cmd_nick(gchar **args, struct cmd_help_t help); static gboolean _cmd_notify(gchar **args, struct cmd_help_t help); static gboolean _cmd_online(gchar **args, struct cmd_help_t help); static gboolean _cmd_outtype(gchar **args, struct cmd_help_t help); +static gboolean _cmd_otr(gchar **args, struct cmd_help_t help); static gboolean _cmd_prefs(gchar **args, struct cmd_help_t help); static gboolean _cmd_priority(gchar **args, struct cmd_help_t help); static gboolean _cmd_quit(gchar **args, struct cmd_help_t help); @@ -650,6 +652,14 @@ static struct cmd_t command_defs[] = "Such as whether you have become inactive, or have closed the chat window.", NULL } } }, + { "/otr", + _cmd_otr, parse_args, 1, 2, NULL, + { "/otr gen|start|end|trust|untrust [contact]", "Off The Record encryption commands.", + { "/otr gen|start|end|trust|untrust [contact]", + "-----------------------------------------", + "gen - Load or create private key and fingerprints.", + NULL } } }, + { "/outtype", _cmd_outtype, parse_args, 1, 1, cons_outtype_setting, { "/outtype on|off", "Send typing notification to recipient.", @@ -1176,7 +1186,13 @@ cmd_execute_default(const char * const inp) if (status != JABBER_CONNECTED) { ui_current_print_line("You are not currently connected."); } else { +#ifdef HAVE_LIBOTR + char *encrypted = otr_encrypt_message(recipient, inp); + message_send(encrypted, recipient); + otr_free_message(encrypted); +#else message_send(inp, recipient); +#endif if (prefs_get_boolean(PREF_CHLOG)) { const char *jid = jabber_get_fulljid(); @@ -2230,7 +2246,14 @@ _cmd_msg(gchar **args, struct cmd_help_t help) usr_jid = usr; } if (msg != NULL) { +#ifdef HAVE_LIBOTR + cons_debug("HAVE_LIBOTR, user_jid: %sm msg: %s", usr_jid, msg); + char *encrypted = otr_encrypt_message(usr_jid, msg); + message_send(encrypted, usr_jid); + otr_free_message(encrypted); +#else message_send(msg, usr_jid); +#endif ui_outgoing_msg("me", usr_jid, msg); if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) { @@ -3015,7 +3038,13 @@ _cmd_tiny(gchar **args, struct cmd_help_t help) if (tiny != NULL) { if (win_type == WIN_CHAT) { char *recipient = ui_current_recipient(); +#ifdef HAVE_LIBOTR + char *encrypted = otr_encrypt_message(recipient, tiny); + message_send(encrypted, recipient); + otr_free_message(encrypted); +#else message_send(tiny, recipient); +#endif if (prefs_get_boolean(PREF_CHLOG)) { const char *jid = jabber_get_fulljid(); @@ -3187,6 +3216,29 @@ _cmd_outtype(gchar **args, struct cmd_help_t help) } static gboolean +_cmd_otr(gchar **args, struct cmd_help_t help) +{ +#ifdef HAVE_LIBOTR + if (strcmp(args[0], "gen") == 0) { + if (jabber_get_connection_status() != JABBER_CONNECTED) { + cons_show("You must be connected with an account to load OTR information."); + return TRUE; + } else { + ProfAccount *account = accounts_get_account(jabber_get_account_name()); + otr_account_load(account); + return TRUE; + } + } else { + cons_show("Usage: %s", help.usage); + return TRUE; + } +#else + cons_show("This version of Profanity has not been build with OTR support enabled"); + return TRUE; +#endif +} + +static gboolean _cmd_gone(gchar **args, struct cmd_help_t help) { char *value = args[0]; diff --git a/src/otr.c b/src/otr.c new file mode 100644 index 00000000..e468bdea --- /dev/null +++ b/src/otr.c @@ -0,0 +1,260 @@ +/* + * otr.c + * + * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <libotr/proto.h> +#include <libotr/privkey.h> +#include <libotr/message.h> +#include <glib.h> + +#include "otr.h" +#include "ui/ui.h" + +static OtrlUserState user_state; +static OtrlMessageAppOps ops; +static char *jid; + +// ops callbacks +static OtrlPolicy +cb_policy(void *opdata, ConnContext *context) +{ + cons_debug("cb_policy"); + return OTRL_POLICY_DEFAULT ^ OTRL_POLICY_ALLOW_V1; +} + +static void +cb_create_privkey(void *opdata, const char *accountname, + const char *protocol) +{ + cons_debug("cb_create_privkey()"); +} + +static int +cb_is_logged_in(void *opdata, const char *accountname, + const char *protocol, const char *recipient) +{ + cons_debug("cb_is_logged_in: account: %s, protocol: %s, recipient: %s", + accountname, protocol, recipient); + return -1; +} + +static void +cb_inject_message(void *opdata, const char *accountname, + const char *protocol, const char *recipient, const char *message) +{ + cons_debug("cb_inject_message: account: %s, protocol, %s, recipient: %s, message: %s", + accountname, protocol, recipient, message); +} + +static void +cb_notify(void *opdata, OtrlNotifyLevel level, + const char *accountname, const char *protocol, const char *username, + const char *title, const char *primary, const char *secondary) +{ + cons_debug("cb_notify"); +} + +static int +cb_display_otr_message(void *opdata, const char *accountname, + const char *protocol, const char *username, const char *msg) +{ + cons_debug("cb_display_otr_message: account: %s, protocol: %s, user: %s, msg: %s", + accountname, protocol, username, msg); + return 0; +} + +static const char * +cb_protocol_name(void *opdata, const char *protocol) +{ + cons_debug("cb_protocol_name: %s", protocol); + return protocol; +} + +static void +cb_new_fingerprint(void *opdata, OtrlUserState us, const char *accountname, + const char *protocol, const char *username, unsigned char fingerprint[20]) +{ + cons_debug("cb_new_fingerprint: account: %s, protocol: %s, username: %s", + accountname, protocol, username); +} + +static void +cb_protocol_name_free(void *opdata, const char *protocol_name) +{ + cons_debug("cb_protocol_name_free: %s", protocol_name); +} + +static void +cb_update_context_list(void *opdata) +{ + cons_debug("cb_update_context_list"); +} + +static void +cb_write_fingerprints(void *opdata) +{ + cons_debug("cb_write_fingerprints"); +} + +static void +cb_gone_secure(void *opdata, ConnContext *context) +{ + cons_debug("cb_gone_secure"); +} + +static void +cb_gone_insecure(void *opdata, ConnContext *context) +{ + cons_debug("cb_gone_insecure"); +} + +static void +cb_still_secure(void *opdata, ConnContext *context, int is_reply) +{ + cons_debug("cb_still_secure: is_reply = %d", is_reply); +} + +static void +cb_log_message(void *opdata, const char *message) +{ + cons_debug("cb_log_message: %s", message); +} + +void +otr_init(void) +{ + cons_debug("otr_init()"); + OTRL_INIT; + + ops.policy = cb_policy; + ops.create_privkey = cb_create_privkey; + ops.is_logged_in = cb_is_logged_in; + ops.inject_message = cb_inject_message; + ops.notify = cb_notify; + ops.display_otr_message = cb_display_otr_message; + ops.update_context_list = cb_update_context_list; + ops.protocol_name = cb_protocol_name; + ops.protocol_name_free = cb_protocol_name_free; + ops.new_fingerprint = cb_new_fingerprint; + ops.write_fingerprints = cb_write_fingerprints; + ops.gone_secure = cb_gone_secure; + ops.gone_insecure = cb_gone_insecure; + ops.still_secure = cb_still_secure; + ops.log_message = cb_log_message; +} + +void +otr_account_load(ProfAccount *account) +{ + cons_debug("otr_account_load()"); + + jid = strdup(account->jid); + + GString *key_filename = g_string_new("./"); + g_string_append(key_filename, account->jid); + g_string_append(key_filename, "_key.txt"); + + GString *fp_filename = g_string_new("./"); + g_string_append(fp_filename, account->jid); + g_string_append(fp_filename, "_fingerprints.txt"); + + user_state = otrl_userstate_create(); + + gcry_error_t err = 0; + + if (!g_file_test(key_filename->str, G_FILE_TEST_IS_REGULAR)) { + cons_debug("Private key not found, generating one"); + err = otrl_privkey_generate(user_state, key_filename->str, account->jid, "xmpp"); + if (!err == GPG_ERR_NO_ERROR) { + cons_debug("Failed to generate private key"); + g_string_free(key_filename, TRUE); + return; + } + cons_debug("Generated private key"); + } + + if (!g_file_test(fp_filename->str, G_FILE_TEST_IS_REGULAR)) { + cons_debug("Fingerprints not found, creating file"); + err = otrl_privkey_write_fingerprints(user_state, fp_filename->str); + if (!err == GPG_ERR_NO_ERROR) { + cons_debug("Failed to create fingerprints file"); + g_string_free(key_filename, TRUE); + return; + } + cons_debug("Created fingerprints file"); + } + + cons_debug("Loading private key"); + err = otrl_privkey_read(user_state, key_filename->str); + if (!err == GPG_ERR_NO_ERROR) { + cons_debug("Failed to load private key"); + g_string_free(key_filename, TRUE); + return; + } + cons_debug("Loaded private key"); + + cons_debug("Loading fingerprints"); + err = otrl_privkey_read_fingerprints(user_state, fp_filename->str, NULL, NULL); + if (!err == GPG_ERR_NO_ERROR) { + cons_debug("Failed to load fingerprints"); + g_string_free(fp_filename, TRUE); + return; + } + cons_debug("Loaded fingerprints"); + + g_string_free(key_filename, TRUE); + g_string_free(fp_filename, TRUE); + return; +} + +char * +otr_encrypt_message(const char * const to, const char * const message) +{ + cons_debug("otr_encrypt_message, account: %s, protocol: xmpp, recipient: %s", jid, to); + gcry_error_t err; + char *newmessage = NULL; + + err = otrl_message_sending( + user_state, + &ops, + NULL, + jid, + "xmpp", + to, + message, + 0, + &newmessage, + NULL, + &ops); + if (!err == GPG_ERR_NO_ERROR) { + cons_debug("Error encrypting, result: %s", newmessage); + return NULL; + } else { + cons_debug("Encrypted, result: %s", newmessage); + return newmessage; + } +} + +void +otr_free_message(char *message) +{ + otrl_message_free(message); +} diff --git a/src/otr.h b/src/otr.h new file mode 100644 index 00000000..42005382 --- /dev/null +++ b/src/otr.h @@ -0,0 +1,33 @@ +/* + * otr.h + * + * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef OTR_H +#define OTR_H + +#include "config/accounts.h" + +void otr_init(void); +void otr_account_load(ProfAccount *account); +char * otr_encrypt_message(const char * const to, const char * const message); +void otr_free_message(char *message); + +#endif diff --git a/src/profanity.c b/src/profanity.c index 116e8b9c..913f3350 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -19,7 +19,6 @@ * along with Profanity. If not, see <http://www.gnu.org/licenses/>. * */ - #include "config.h" #ifdef HAVE_GIT_VERSION @@ -44,6 +43,7 @@ #include "contact.h" #include "log.h" #include "muc.h" +#include "otr.h" #include "resource.h" #include "ui/notifier.h" #include "ui/ui.h" @@ -648,6 +648,9 @@ _init(const int disable_tls, char *log_level) log_info("Initialising contact list"); roster_init(); muc_init(); +#ifdef HAVE_LIBOTR + otr_init(); +#endif atexit(_shutdown); } |