diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | src/command/command.c | 20 | ||||
| -rw-r--r-- | src/otr.c | 260 | ||||
| -rw-r--r-- | src/otr.h | 33 | ||||
| -rw-r--r-- | src/profanity.c | 8 |
7 files changed, 340 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 6c29afec..3748015d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ core bugs/ TODO plugins/ +*_key.txt +*_fingerprints.txt diff --git a/Makefile.am b/Makefile.am index 45d8a9c0..fae529e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,8 @@ profanity_SOURCES = \ src/tools/tinyurl.c src/tools/tinyurl.h \ src/config/accounts.c src/config/accounts.h \ src/config/preferences.c src/config/preferences.h \ - src/config/theme.c src/config/theme.h + src/config/theme.c src/config/theme.h \ + src/otr.c src/otr.h TESTS = tests/testsuite check_PROGRAMS = tests/testsuite diff --git a/configure.ac b/configure.ac index a30c96d8..a147ae44 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,8 @@ AC_ARG_WITH([libxml2], [AS_HELP_STRING([--with-libxml2], [link with libxml2 instead of expat])]) AC_ARG_WITH([xscreensaver], [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine indle time])]) +AC_ARG_WITH([otr], + [AS_HELP_STRING([--with-libotr], [enable otr entryption using libtr library])]) # Checks for libraries. if test "x$with_libxml2" = xyes; then @@ -54,7 +56,14 @@ elif test "x$with_xscreensaver" = x; then [AC_MSG_NOTICE([libXss not found, falling back to profanity auto-away])]) AC_CHECK_LIB([X11], [main], [], [AC_MSG_NOTICE([libX11 not found, falling back to profanity auto-away])]) +fi +if test "x$with_otr" = xyes; then + AC_CHECK_LIB([otr], [main], [], + [AC_MSG_ERROR([libotr is required for otr encryption support])]) +elif test "x$enable_otr" = x; then + AC_CHECK_LIB([otr], [main], [], + [AC_MSG_NOTICE([libotr not found, otr entryption support no enabled])]) fi AC_CHECK_LIB([resolv], [main], [], @@ -87,14 +96,19 @@ if test "x$enable_notifications" != xno; then [AC_MSG_NOTICE([libnotify module not found])]) fi +if test "x$with_otr" != xno; then + PKG_CHECK_MODULES([OTR], [libotr], [], + [AC_MSG_NOTICE([libotr module not found])]) +fi + # Default parameters AM_CFLAGS="-Wall" if test "x$PACKAGE_STATUS" = xdevelopment; then AM_CFLAGS="$AM_CFLAGS -Wunused -Werror" fi -LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS" +LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS $OTR_LIBS" -AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS" +AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS $OTR_CLAGS" AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CPPFLAGS) diff --git a/src/command/command.c b/src/command/command.c index ef00fae8..586cdb52 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -38,6 +38,7 @@ #include "jid.h" #include "log.h" #include "muc.h" +#include "otr.h" #include "profanity.h" #include "tools/autocomplete.h" #include "tools/parser.h" @@ -1159,7 +1160,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(); @@ -2194,7 +2201,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)) { @@ -2981,7 +2995,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(); 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 4e9e887c..4ac3ca98 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" #include <locale.h> @@ -40,6 +39,7 @@ #include "contact.h" #include "log.h" #include "muc.h" +#include "otr.h" #include "resource.h" #include "ui/notifier.h" #include "ui/ui.h" @@ -249,6 +249,9 @@ void prof_handle_login_account_success(char *account_name) { ProfAccount *account = accounts_get_account(account_name); +#ifdef HAVE_LIBOTR + otr_account_load(account); +#endif resource_presence_t resource_presence = accounts_get_login_presence(account->name); contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence); cons_show_login_success(account); @@ -632,6 +635,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); } |