devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 17:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1566 from DebXWoody/bugfixing/ox

Browse Source 
Bugfixes for OX implementation
This commit is contained in:
Michael Vetter
2021-07-01 18:26:06 +02:00
committed by GitHub
parent 7a4a78ab06 d01ba72535
commit 3a9cffe013
6 changed files with 88 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/xmpp/message.c
View File

@@ -86,7 +86,7 @@ static void _handle_muc_private_message(xmpp_stanza_t* const stanza);
static void _handle_conference(xmpp_stanza_t* const stanza);
static void _handle_captcha(xmpp_stanza_t* const stanza);
static void _handle_receipt_received(xmpp_stanza_t* const stanza);
static void _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char *result_id, GDateTime* timestamp);
static void _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char* result_id, GDateTime* timestamp);
static void _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_mam);
static xmpp_stanza_t* _handle_carbons(xmpp_stanza_t* const stanza);
static void _send_message_stanza(xmpp_stanza_t* const stanza);
@@ -120,7 +120,7 @@ _handle_headline(xmpp_stanza_t* const stanza)
{
xmpp_stanza_t* body = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_BODY);
if (body) {
char *text = xmpp_stanza_get_text(body);
char* text = xmpp_stanza_get_text(body);
if (text) {
cons_show("Headline: %s", text);
xmpp_free(connection_get_ctx(), text);
@@ -647,7 +647,7 @@ message_send_chat_omemo(const char* const jid, uint32_t sid, GList* keys,
xmpp_stanza_t* key_stanza = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(key_stanza, "key");
char* rid = g_strdup_printf("%d", key->device_id);
log_debug("[OMEMO] Sending to device rid %s", rid == NULL ? "NULL" : rid );
log_debug("[OMEMO] Sending to device rid %s", rid == NULL ? "NULL" : rid);
xmpp_stanza_set_attribute(key_stanza, "rid", rid);
g_free(rid);
if (key->prekey) {
@@ -1004,11 +1004,11 @@ _handle_groupchat(xmpp_stanza_t* const stanza)
xmpp_ctx_t* ctx = connection_get_ctx();
const char* room_jid = xmpp_stanza_get_from(stanza);
if(!room_jid) {
if (!room_jid) {
return;
}
Jid* from_jid = jid_create(room_jid);
if(!from_jid) {
if (!from_jid) {
return;
}
@@ -1180,7 +1180,7 @@ _handle_receipt_received(xmpp_stanza_t* const stanza)
}
Jid* jidp = jid_create(fulljid);
if(!jidp) {
if (!jidp) {
return;
}
@@ -1310,7 +1310,7 @@ _handle_carbons(xmpp_stanza_t* const stanza)
}
static void
_handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char *result_id, GDateTime* timestamp)
_handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char* result_id, GDateTime* timestamp)
{
// some clients send the mucuser namespace with private messages
// if the namespace exists, and the stanza contains a body element, assume its a private message
@@ -1460,37 +1460,39 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
message->enc = PROF_MSG_ENC_OX;
#ifdef HAVE_LIBGPGME
xmpp_ctx_t* const ctx = connection_get_ctx();
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
if (!ox) {
return;
}
char* ox_text = xmpp_stanza_get_text(ox);
if (!ox_text) {
return;
}
message->plain = p_ox_gpg_decrypt(ox_text);
xmpp_free(ctx, ox_text);
xmpp_stanza_t *x = xmpp_stanza_new_from_string(ctx, message->plain);
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload");
if (p) {
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body");
if (b) {
message->plain = xmpp_stanza_get_text(b);
if(message->plain == NULL ) {
message->plain = xmpp_stanza_get_text(stanza);
if (ox) {
message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox));
if (message->plain) {
xmpp_stanza_t* x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain);
if (x) {
xmpp_stanza_t* p = xmpp_stanza_get_child_by_name(x, "payload");
if (!p) {
log_warning("OX Stanza - no Payload");
message->plain = "OX error: No payload found";
return;
}
xmpp_stanza_t* b = xmpp_stanza_get_child_by_name(p, "body");
if (!b) {
log_warning("OX Stanza - no body");
message->plain = "OX error: No paylod body found";
return;
}
message->plain = xmpp_stanza_get_text(b);
message->encrypted = xmpp_stanza_get_text(ox);
if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza);
}
} else {
message->plain = "Unable to decrypt OX message (XEP-0373: OpenPGP for XMPP)";
log_warning("OX Stanza text to stanza failed");
}
message->encrypted = xmpp_stanza_get_text(ox);
if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza);
}
message->encrypted = xmpp_stanza_get_text(ox);
} else {
message->plain = "Unable to decrypt OX message (XEP-0373: OpenPGP for XMPP)";
}
} else {
message->plain = "OX stanza without openpgp name";
log_warning("OX Stanza without openpgp stanza");
}
#endif // HAVE_LIBGPGME
}
@@ -1513,7 +1515,7 @@ _handle_mam(xmpp_stanza_t* const stanza)
// same as <stanza-id> from XEP-0359 for live messages
const char* result_id = xmpp_stanza_get_id(result);
GDateTime *timestamp = stanza_get_delay_from(forwarded, NULL);
GDateTime* timestamp = stanza_get_delay_from(forwarded, NULL);
xmpp_stanza_t* message_stanza = xmpp_stanza_get_child_by_ns(forwarded, "jabber:client");

19
src/xmpp/ox.c
View File

@@ -45,6 +45,9 @@
#include "pgp/gpg.h"
#ifdef HAVE_LIBGPGME
#define KEYID_LENGTH 40
static void _ox_metadata_node__public_key(const char* const fingerprint);
static int _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata);
@@ -165,8 +168,8 @@ ox_announce_public_key(const char* const filename)
void
ox_discover_public_key(const char* const jid)
{
assert(jid);
log_info("Discovering Public Key for %s", jid);
assert(jid && strlen(jid) > 0);
log_info("[OX] Discovering Public Key for %s", jid);
cons_show("Discovering Public Key for %s", jid);
// iq
xmpp_ctx_t* const ctx = connection_get_ctx();
@@ -188,6 +191,7 @@ ox_discover_public_key(const char* const jid)
xmpp_id_handler_add(connection_get_conn(), _ox_metadata_result, id, strdup(jid));
xmpp_send(connection_get_conn(), iq);
xmpp_stanza_release(iq);
}
void
@@ -228,7 +232,7 @@ _ox_metadata_node__public_key(const char* const fingerprint)
{
log_info("Annonuce OpenPGP metadata: %s", fingerprint);
assert(fingerprint);
assert(strlen(fingerprint) == 40);
assert(strlen(fingerprint) == KEYID_LENGTH);
// iq
xmpp_ctx_t* const ctx = connection_get_ctx();
char* id = xmpp_uuid_gen(ctx);
@@ -269,7 +273,7 @@ _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void*
log_debug("[OX] Processing result %s's metadata.", (char*)userdata);
if (g_strcmp0(xmpp_stanza_get_type(stanza), "result") != 0) {
log_debug("[OX] Error: No result");
log_debug("[OX] Error: Unable to load metadata of user %s - Not a stanza result type", (char*)userdata);
return FALSE;
}
// pubsub
@@ -301,8 +305,11 @@ _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void*
while (pubkeymetadata) {
const char* fingerprint = xmpp_stanza_get_attribute(pubkeymetadata, STANZA_ATTR_V4_FINGERPRINT);
if (fingerprint) {
if ( strlen( fingerprint ) == KEYID_LENGTH ) {
cons_show(fingerprint);
} else {
cons_show("OX: Wrong char size of public key");
log_error("[OX] Wrong chat size of public key %s", fingerprint);
}
pubkeymetadata = xmpp_stanza_get_next(pubkeymetadata);
}
@@ -332,7 +339,7 @@ _ox_request_public_key(const char* const jid, const char* const fingerprint)
{
assert(jid);
assert(fingerprint);
assert(strlen(fingerprint) == 40);
assert(strlen(fingerprint) == KEYID_LENGTH);
cons_show("Requesting Public Key %s for %s", fingerprint, jid);
log_info("[OX] Request %s's public key %s.", jid, fingerprint);
// iq