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

Merge pull request #1618 from profanity-im/fix/1614-otr

Browse Source 
Fix carbons criteria
This commit is contained in:
Michael Vetter 2021-11-25 18:51:46 +01:00 committed by GitHub
commit 064ee6b1e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xmpp/message.c
View File

@ -223,7 +223,13 @@ _message_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* con
gboolean is_carbon = FALSE; gboolean is_carbon = FALSE;
// XEP-0280: Message Carbons // XEP-0280: Message Carbons
xmpp_stanza_t* carbons = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS); // Only allow `<sent xmlns='urn:xmpp:carbons:2'>` and `<received xmlns='urn:xmpp:carbons:2'>` carbons
// Thus ignoring `<private xmlns="urn:xmpp:carbons:2"/>`
xmpp_stanza_t* carbons = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_SENT, STANZA_NS_CARBONS);
if (!carbons) {
carbons = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_RECEIVED, STANZA_NS_CARBONS);
}
if (carbons) { if (carbons) {
// carbon must come from ourselves // carbon must come from ourselves
@ -1283,7 +1289,7 @@ _handle_carbons(xmpp_stanza_t* const stanza)
} }
*/ */
if ((g_strcmp0(name, "received") != 0) && (g_strcmp0(name, "sent") != 0)) { if ((g_strcmp0(name, STANZA_NAME_RECEIVED) != 0) && (g_strcmp0(name, STANZA_NAME_SENT) != 0)) {
log_warning("Carbon received with unrecognised stanza name: %s", name); log_warning("Carbon received with unrecognised stanza name: %s", name);
return NULL; return NULL;
} }

2
src/xmpp/stanza.h
View File

@ -117,6 +117,8 @@
#define STANZA_NAME_USERNAME "username" #define STANZA_NAME_USERNAME "username"
#define STANZA_NAME_PROPOSE "propose" #define STANZA_NAME_PROPOSE "propose"
#define STANZA_NAME_REPORT "report" #define STANZA_NAME_REPORT "report"
#define STANZA_NAME_RECEIVED "received"
#define STANZA_NAME_SENT "sent"
// error conditions // error conditions
#define STANZA_NAME_BAD_REQUEST "bad-request" #define STANZA_NAME_BAD_REQUEST "bad-request"