aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Removed server_events dependency on libotr headers

Browse Source
This commit is contained in:
James Booth 2015-04-27 23:17:38 +01:00
parent f219302f06
commit eb177ccbef
4 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/event/server_events.c
View File

@ -46,7 +46,6 @@
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
#include "otr/otr.h" #include "otr/otr.h"
#include <libotr/proto.h>
#endif #endif
#include "ui/ui.h" #include "ui/ui.h"
@ -321,45 +320,7 @@ void
srv_incoming_message(char *barejid, char *resource, char *message) srv_incoming_message(char *barejid, char *resource, char *message)
{ {
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
gboolean was_decrypted = FALSE; otr_on_message_recv(barejid, resource, message);
char *otr_message;
prof_otrpolicy_t policy = otr_get_policy(barejid);
char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE);
//check for OTR whitespace (opportunistic or always)
if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) {
if (whitespace_base) {
if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
// Remove whitespace pattern for proper display in UI
// Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
int tag_length = 24;
if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
tag_length = 32;
}
memmove(whitespace_base, whitespace_base+tag_length, tag_length);
char *otr_query_message = otr_start_query();
cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
message_send_chat_encrypted(barejid, otr_query_message);
}
}
}
otr_message = otr_decrypt_message(barejid, message, &was_decrypted);
// internal OTR message
if (otr_message == NULL) {
return;
}
if (policy == PROF_OTRPOLICY_ALWAYS && !was_decrypted && !whitespace_base) {
char *otr_query_message = otr_start_query();
cons_show("Attempting to start OTR session...");
message_send_chat_encrypted(barejid, otr_query_message);
}
ui_incoming_msg(barejid, resource, otr_message, NULL);
chat_log_otr_msg_in(barejid, otr_message, was_decrypted);
otr_free_message(otr_message);
#else #else
ui_incoming_msg(barejid, resource, message, NULL); ui_incoming_msg(barejid, resource, message, NULL);
chat_log_msg_in(barejid, message); chat_log_msg_in(barejid, message);

44
src/otr/otr.c
View File

@ -269,6 +269,50 @@ otr_on_connect(ProfAccount *account)
return; return;
} }
void
otr_on_message_recv(const char * const barejid, const char * const resource, const char * const message)
{
gboolean was_decrypted = FALSE;
char *decrypted;
prof_otrpolicy_t policy = otr_get_policy(barejid);
char *whitespace_base = strstr(message, OTRL_MESSAGE_TAG_BASE);
//check for OTR whitespace (opportunistic or always)
if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) {
if (whitespace_base) {
if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
// Remove whitespace pattern for proper display in UI
// Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
int tag_length = 24;
if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
tag_length = 32;
}
memmove(whitespace_base, whitespace_base+tag_length, tag_length);
char *otr_query_message = otr_start_query();
cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
message_send_chat_encrypted(barejid, otr_query_message);
}
}
}
decrypted = otr_decrypt_message(barejid, message, &was_decrypted);
// internal OTR message
if (decrypted == NULL) {
return;
}
if (policy == PROF_OTRPOLICY_ALWAYS && !was_decrypted && !whitespace_base) {
char *otr_query_message = otr_start_query();
cons_show("Attempting to start OTR session...");
message_send_chat_encrypted(barejid, otr_query_message);
}
ui_incoming_msg(barejid, resource, decrypted, NULL);
chat_log_otr_msg_in(barejid, decrypted, was_decrypted);
otr_free_message(decrypted);
}
void void
otr_keygen(ProfAccount *account) otr_keygen(ProfAccount *account)
{ {

1
src/otr/otr.h
View File

@ -56,6 +56,7 @@ char* otr_libotr_version(void);
char* otr_start_query(void); char* otr_start_query(void);
void otr_poll(void); void otr_poll(void);
void otr_on_connect(ProfAccount *account); void otr_on_connect(ProfAccount *account);
void otr_on_message_recv(const char * const barejid, const char * const resource, const char * const message);
void otr_keygen(ProfAccount *account); void otr_keygen(ProfAccount *account);
char* otr_tag_message(const char * const msg); char* otr_tag_message(const char * const msg);

3
tests/otr/stub_otr.c
View File

@ -41,6 +41,7 @@ char* otr_start_query(void)
void otr_poll(void) {} void otr_poll(void) {}
void otr_on_connect(ProfAccount *account) {} void otr_on_connect(ProfAccount *account) {}
void otr_on_message_recv(const char * const barejid, const char * const resource, const char * const message) {}
void otr_keygen(ProfAccount *account) void otr_keygen(ProfAccount *account)
{ {
@ -53,7 +54,7 @@ gboolean otr_key_loaded(void)
} }
char* otr_tag_message(const char * const msg) char* otr_tag_message(const char * const msg)
{ {
return NULL; return NULL;
} }