diff options
| author | Michael Vetter <jubalh@iodoru.org> | 2021-11-25 14:45:45 +0100 |
|---|---|---|
| committer | Michael Vetter <jubalh@iodoru.org> | 2021-11-25 15:33:49 +0100 |
| commit | 2f7317cc1837ff8e9dfab8b6b0d8529f44391966 (patch) | |
| tree | 45b6882052fd86108ca7276e6b7b87a73de859b3 | |
| parent | 6d2f929950c12c7e19b4315973164b44f9c52b8b (diff) | |
| download | profani-tty-2f7317cc1837ff8e9dfab8b6b0d8529f44391966.tar.gz | |
Fix carbons criteria
We came into the carbons checking code when we received `<private xmlns="urn:xmpp:carbons:2"/>`. Which actually marks a message to _not_ be a carbon. In this code we also make sure that carbons only come from us. If not we don't call the message handler code. So we should actually only check for `<sent xmlns='urn:xmpp:carbons:2'>` and `<received xmlns='urn:xmpp:carbons:2'>`. Thanks pukkamustard and Holger. Fixes https://github.com/profanity-im/profanity/issues/1614
| -rw-r--r-- | src/xmpp/message.c | 10 | ||||
| -rw-r--r-- | src/xmpp/stanza.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 1a964846..4aa22437 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -223,7 +223,13 @@ _message_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* con gboolean is_carbon = FALSE; // 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) { // 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); return NULL; } diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index e2c22bd8..7aac5d08 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -117,6 +117,8 @@ #define STANZA_NAME_USERNAME "username" #define STANZA_NAME_PROPOSE "propose" #define STANZA_NAME_REPORT "report" +#define STANZA_NAME_RECEIVED "received" +#define STANZA_NAME_SENT "sent" // error conditions #define STANZA_NAME_BAD_REQUEST "bad-request" |