diff options
author | James Booth <boothj5@gmail.com> | 2014-02-13 23:07:09 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-02-13 23:07:09 +0000 |
commit | 450c01ecb4e7f943d27b2a68027c88fe7ae99483 (patch) | |
tree | 13a8416d745bc5f7a396a9a7dfc2a9021f0c1d44 /src/otr/otrlibv4.c | |
parent | 4e81707b2751434c0561b3040754a45f97c0fd2b (diff) | |
download | profani-tty-450c01ecb4e7f943d27b2a68027c88fe7ae99483.tar.gz |
Refactored common otr library code
Diffstat (limited to 'src/otr/otrlibv4.c')
-rw-r--r-- | src/otr/otrlibv4.c | 436 |
1 files changed, 25 insertions, 411 deletions
diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index ddd4aeeb..c9442a90 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -1,5 +1,5 @@ /* - * otr4.c + * otrlibv4.c * * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com> * @@ -23,45 +23,15 @@ #include <libotr/proto.h> #include <libotr/privkey.h> #include <libotr/message.h> -#include <glib.h> -#include "otr.h" -#include "log.h" -#include "roster_list.h" -#include "contact.h" #include "ui/ui.h" -static OtrlUserState user_state; -static OtrlMessageAppOps ops; -static char *jid; -static gboolean data_loaded; - -// ops callbacks -static OtrlPolicy -cb_policy(void *opdata, ConnContext *context) +OtrlPolicy +otrlib_policy(void) { return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 | OTRL_POLICY_ALLOW_V3; } -static int -cb_is_logged_in(void *opdata, const char *accountname, - const char *protocol, const char *recipient) -{ - PContact contact = roster_get_contact(recipient); - if (g_strcmp0(p_contact_presence(contact), "offline") == 0) { - return 0; - } else { - return 1; - } -} - -static void -cb_inject_message(void *opdata, const char *accountname, - const char *protocol, const char *recipient, const char *message) -{ - message_send(message, recipient); -} - static const char* cb_otr_error_message(void *opdata, ConnContext *context, OtrlErrorCode err_code) @@ -99,359 +69,40 @@ cb_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, } } -static void -cb_write_fingerprints(void *opdata) -{ - gcry_error_t err = 0; - gchar *data_home = xdg_get_data_home(); - gchar *account_dir = str_replace(jid, "@", "_at_"); - - GString *basedir = g_string_new(data_home); - g_string_append(basedir, "/profanity/otr/"); - g_string_append(basedir, account_dir); - g_string_append(basedir, "/"); - free(account_dir); - - GString *fpsfilename = g_string_new(basedir->str); - g_string_append(fpsfilename, "fingerprints.txt"); - err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); - if (!err == GPG_ERR_NO_ERROR) { - log_error("Failed to write fingerprints file"); - cons_show_error("Failed to create fingerprints file"); - } - g_string_free(basedir, TRUE); - g_string_free(fpsfilename, TRUE); -} - -static void -cb_gone_secure(void *opdata, ConnContext *context) -{ - ui_gone_secure(context->username, otr_is_trusted(context->username)); -} - -char * -otr_libotr_version(void) -{ - return OTRL_VERSION; -} - -void -otr_init(void) -{ - log_info("Initialising OTR"); - OTRL_INIT; - - ops.policy = cb_policy; - ops.is_logged_in = cb_is_logged_in; - ops.inject_message = cb_inject_message; - ops.otr_error_message = cb_otr_error_message; - ops.otr_error_message_free = cb_otr_error_message_free; - ops.handle_msg_event = cb_handle_msg_event; - ops.write_fingerprints = cb_write_fingerprints; - ops.gone_secure = cb_gone_secure; - - data_loaded = FALSE; -} - -void -otr_on_connect(ProfAccount *account) -{ - jid = strdup(account->jid); - log_info("Loading OTR key for %s", jid); - - gchar *data_home = xdg_get_data_home(); - gchar *account_dir = str_replace(jid, "@", "_at_"); - - GString *basedir = g_string_new(data_home); - g_string_append(basedir, "/profanity/otr/"); - g_string_append(basedir, account_dir); - g_string_append(basedir, "/"); - free(account_dir); - - if (!mkdir_recursive(basedir->str)) { - log_error("Could not create %s for account %s.", basedir->str, jid); - cons_show_error("Could not create %s for account %s.", basedir->str, jid); - g_string_free(basedir, TRUE); - return; - } - - user_state = otrl_userstate_create(); - - gcry_error_t err = 0; - - GString *keysfilename = g_string_new(basedir->str); - g_string_append(keysfilename, "keys.txt"); - if (!g_file_test(keysfilename->str, G_FILE_TEST_IS_REGULAR)) { - log_info("No private key file found %s", keysfilename->str); - data_loaded = FALSE; - } else { - log_info("Loading OTR private key %s", keysfilename->str); - err = otrl_privkey_read(user_state, keysfilename->str); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - log_error("Failed to load private key"); - return; - } else { - log_info("Loaded private key"); - data_loaded = TRUE; - } - } - - GString *fpsfilename = g_string_new(basedir->str); - g_string_append(fpsfilename, "fingerprints.txt"); - if (!g_file_test(fpsfilename->str, G_FILE_TEST_IS_REGULAR)) { - log_info("No fingerprints file found %s", fpsfilename->str); - data_loaded = FALSE; - } else { - log_info("Loading fingerprints %s", fpsfilename->str); - err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - g_string_free(fpsfilename, TRUE); - log_error("Failed to load fingerprints"); - return; - } else { - log_info("Loaded fingerprints"); - data_loaded = TRUE; - } - } - - if (data_loaded) { - cons_show("Loaded OTR private key for %s", jid); - } - - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - g_string_free(fpsfilename, TRUE); - return; -} - -void -otr_keygen(ProfAccount *account) -{ - if (data_loaded) { - cons_show("OTR key already generated."); - return; - } - - jid = strdup(account->jid); - log_info("Generating OTR key for %s", jid); - - jid = strdup(account->jid); - - gchar *data_home = xdg_get_data_home(); - gchar *account_dir = str_replace(jid, "@", "_at_"); - - GString *basedir = g_string_new(data_home); - g_string_append(basedir, "/profanity/otr/"); - g_string_append(basedir, account_dir); - g_string_append(basedir, "/"); - free(account_dir); - - if (!mkdir_recursive(basedir->str)) { - log_error("Could not create %s for account %s.", basedir->str, jid); - cons_show_error("Could not create %s for account %s.", basedir->str, jid); - g_string_free(basedir, TRUE); - return; - } - - gcry_error_t err = 0; - - GString *keysfilename = g_string_new(basedir->str); - g_string_append(keysfilename, "keys.txt"); - log_debug("Generating private key file %s for %s", keysfilename->str, jid); - cons_show("Generating private key, this may take some time."); - cons_show("Moving the mouse randomly around the screen may speed up the process!"); - ui_current_page_off(); - ui_refresh(); - err = otrl_privkey_generate(user_state, keysfilename->str, account->jid, "xmpp"); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - log_error("Failed to generate private key"); - cons_show_error("Failed to generate private key"); - return; - } - log_info("Private key generated"); - cons_show(""); - cons_show("Private key generation complete."); - - GString *fpsfilename = g_string_new(basedir->str); - g_string_append(fpsfilename, "fingerprints.txt"); - log_debug("Generating fingerprints file %s for %s", fpsfilename->str, jid); - err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - log_error("Failed to create fingerprints file"); - cons_show_error("Failed to create fingerprints file"); - return; - } - log_info("Fingerprints file created"); - - err = otrl_privkey_read(user_state, keysfilename->str); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - log_error("Failed to load private key"); - data_loaded = FALSE; - return; - } - - err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); - if (!err == GPG_ERR_NO_ERROR) { - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - log_error("Failed to load fingerprints"); - data_loaded = FALSE; - return; - } - - data_loaded = TRUE; - - g_string_free(basedir, TRUE); - g_string_free(keysfilename, TRUE); - g_string_free(fpsfilename, TRUE); - return; -} - -gboolean -otr_key_loaded(void) -{ - return data_loaded; -} - -gboolean -otr_is_secure(const char * const recipient) -{ - ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context == NULL) { - return FALSE; - } - - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { - return FALSE; - } else { - return TRUE; - } -} - -gboolean -otr_is_trusted(const char * const recipient) -{ - ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context == NULL) { - return FALSE; - } - - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { - return TRUE; - } - - if (context->active_fingerprint && - g_strcmp0(context->active_fingerprint->trust, "trusted") == 0) { - return TRUE; - } - - return FALSE; -} - void -otr_trust(const char * const recipient) +otrlib_init_ops(OtrlMessageAppOps *ops) { - ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context == NULL) { - return; - } - - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { - return; - } - - if (context->active_fingerprint) { - context->active_fingerprint->trust = "trusted"; - cb_write_fingerprints(NULL); - } - - return; + ops->otr_error_message = cb_otr_error_message; + ops->otr_error_message_free = cb_otr_error_message_free; + ops->handle_msg_event = cb_handle_msg_event; } -void -otr_untrust(const char * const recipient) +ConnContext * +otrlib_context_find(OtrlUserState user_state, const char * const recipient, char *jid) { - ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context == NULL) { - return; - } - - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED) { - return; - } - - if (context->active_fingerprint) { - context->active_fingerprint->trust = NULL; - cb_write_fingerprints(NULL); - } - - return; + return otrl_context_find(user_state, recipient, jid, "xmpp", OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); } void -otr_end_session(const char * const recipient) +otrlib_end_session(OtrlUserState user_state, const char * const recipient, char *jid, OtrlMessageAppOps *ops) { ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); if (context != NULL) { - otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient, 0); + otrl_message_disconnect(user_state, ops, NULL, jid, "xmpp", recipient, 0); } } -char * -otr_get_my_fingerprint(void) -{ - char fingerprint[45]; - otrl_privkey_fingerprint(user_state, fingerprint, jid, "xmpp"); - char *result = strdup(fingerprint); - - return result; -} - -char * -otr_get_their_fingerprint(const char * const recipient) -{ - ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context != NULL) { - Fingerprint *fingerprint = context->active_fingerprint; - char readable[45]; - otrl_privkey_hash_to_human(readable, fingerprint->fingerprint); - return strdup(readable); - } else { - return NULL; - } -} - -char * -otr_encrypt_message(const char * const to, const char * const message) +gcry_error_t +otrlib_encrypt_message(OtrlUserState user_state, OtrlMessageAppOps *ops, char *jid, const char * const to, + const char * const message, char **newmessage) { gcry_error_t err; - char *newmessage = NULL; err = otrl_message_sending( user_state, - &ops, + ops, NULL, jid, "xmpp", @@ -459,67 +110,30 @@ otr_encrypt_message(const char * const to, const char * const message) OTRL_INSTAG_MASTER, message, 0, - &newmessage, + newmessage, OTRL_FRAGMENT_SEND_SKIP, NULL, NULL, NULL); - if (!err == GPG_ERR_NO_ERROR) { - return NULL; - } else { - return newmessage; - } + return err; } -char * -otr_decrypt_message(const char * const from, const char * const message, gboolean *was_decrypted) +int +otrlib_decrypt_message(OtrlUserState user_state, OtrlMessageAppOps *ops, char *jid, const char * const from, + const char * const message, char **decrypted, OtrlTLV **tlvs) { - char *decrypted = NULL; - OtrlTLV *tlvs = NULL; - OtrlTLV *tlv = NULL; - int result = otrl_message_receiving( + return otrl_message_receiving( user_state, - &ops, + ops, NULL, jid, "xmpp", from, message, - &decrypted, - &tlvs, + decrypted, + tlvs, NULL, NULL, NULL); - - // internal libotr message - if (result == 1) { - tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); - if (tlv) { - ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp", - OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); - - if (context != NULL) { - otrl_context_force_plaintext(context); - ui_gone_insecure(from); - } - } - return NULL; - - // message was decrypted, return to user - } else if (decrypted != NULL) { - *was_decrypted = TRUE; - return decrypted; - - // normal non OTR message - } else { - *was_decrypted = FALSE; - return strdup(message); - } -} - -void -otr_free_message(char *message) -{ - otrl_message_free(message); } |