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

Use flags in xmmp/message.c for encryption and trust

Browse Source
This commit is contained in:
Paul Fariello
2019-06-16 22:55:07 +02:00
parent a650ecc67d
commit 3bb3cc625d
6 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/xmpp/message.c
View File

@@ -696,6 +696,7 @@ static void
_handle_groupchat(xmpp_stanza_t *const stanza)
{
xmpp_ctx_t *ctx = connection_get_ctx();
int flags = 0;
char *message = NULL;
const char *id = xmpp_stanza_get_id(stanza);
@@ -748,11 +749,15 @@ _handle_groupchat(xmpp_stanza_t *const stanza)
}
// check omemo encryption
gboolean omemo = FALSE;
gboolean trusted = FALSE;
#ifdef HAVE_OMEMO
gboolean trusted = FALSE;
message = omemo_receive_message(stanza, &trusted);
omemo = message != NULL;
if (message != NULL) {
flags |= MSG_ENC_OMEMO;
if (trusted) {
flags |= MSG_TRUSTED;
}
}
#endif
if (!message) {
@@ -766,10 +771,10 @@ _handle_groupchat(xmpp_stanza_t *const stanza)
// determine if the notifications happened whilst offline
GDateTime *timestamp = stanza_get_delay(stanza);
if (timestamp) {
sv_ev_room_history(jid->barejid, jid->resourcepart, timestamp, message, omemo, trusted);
sv_ev_room_history(jid->barejid, jid->resourcepart, timestamp, message, flags);
g_date_time_unref(timestamp);
} else {
sv_ev_room_message(jid->barejid, jid->resourcepart, message, id, omemo, trusted);
sv_ev_room_message(jid->barejid, jid->resourcepart, message, id, flags);
}
xmpp_free(ctx, message);
@@ -873,6 +878,7 @@ static gboolean
_handle_carbons(xmpp_stanza_t *const stanza)
{
char *message_txt = NULL;
int flags = 0;
xmpp_stanza_t *carbons = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS);
if (!carbons) {
return FALSE;
@@ -907,11 +913,15 @@ _handle_carbons(xmpp_stanza_t *const stanza)
}
// check omemo encryption
gboolean omemo = FALSE;
gboolean trusted = FALSE;
#ifdef HAVE_OMEMO
gboolean trusted = FALSE;
message_txt = omemo_receive_message(message, &trusted);
omemo = message_txt != NULL;
if (message_txt != NULL) {
flags != MSG_ENC_OMEMO;
if (trusted) {
flags |= MSG_TRUSTED;
}
}
#endif
if (!message_txt) {
@@ -947,11 +957,11 @@ _handle_carbons(xmpp_stanza_t *const stanza)
// if we are the recipient, treat as standard incoming message
if (g_strcmp0(my_jid->barejid, jid_to->barejid) == 0) {
sv_ev_incoming_carbon(jid_from->barejid, jid_from->resourcepart, message_txt, enc_message, omemo, trusted);
sv_ev_incoming_carbon(jid_from->barejid, jid_from->resourcepart, message_txt, enc_message, flags);
// else treat as a sent message
} else {
sv_ev_outgoing_carbon(jid_to->barejid, message_txt, enc_message, omemo, trusted);
sv_ev_outgoing_carbon(jid_to->barejid, message_txt, enc_message, flags);
}
xmpp_ctx_t *ctx = connection_get_ctx();

5
src/xmpp/message.h
View File

@@ -35,6 +35,11 @@
#ifndef XMPP_MESSAGE_H
#define XMPP_MESSAGE_H
#define PROF_MSG_ENC_OTR 1
#define PROF_MSG_ENC_PGP 2
#define PROF_MSG_ENC_OMEMO 4
#define PROF_MSG_TRUSTED 8
typedef int(*ProfMessageCallback)(xmpp_stanza_t *const stanza, void *const userdata);
typedef void(*ProfMessageFreeCallback)(void *userdata);