Changeset 3a620ff

Timestamp:

2015-12-16T01:02:12Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

d11ccbf

Parents:

4c29622

Message:

jabber: Add message processing hints to OTR messages (XEP-0334/0364)

This prevents them from being stored or copied to other clients when
carbons are enabled.

Location:

protocols/jabber

Files:

• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)

protocols/jabber/jabber.c

@@ -432 +432 @@
                 /* Just make sure we do this only once. */
                 bud->flags |= JBFLAG_PROBED_XEP85;
+        }
+
+        /* XEP-0364 suggests we add message processing hints (XEP-0334) to OTR messages,
+           mostly to avoid carbons (XEP-0280) and server-side message archiving.
+           OTR messages are roughly like this: /^\?OTR(.*\?| Error:|:)/
+           But I'm going to simplify it to messages starting with "?OTR". */
+        if (g_str_has_prefix(message, "?OTR")) {
+                int i;
+                char *hints[] = {
+                        "no-copy", XMLNS_HINTS,
+                        "no-permanent-store", XMLNS_HINTS,
+                        "private", XMLNS_CARBONS,
+                        NULL
+                };
+                        
+                for (i = 0; hints[i]; i += 2) {
+                        struct xt_node *hint;
+                        hint = xt_new_node(hints[i], NULL, NULL);
+                        xt_add_attr(hint, "xmlns", hints[i + 1]);
+                        xt_add_child(node, hint);
+                }
         }
 

protocols/jabber/jabber.h

@@ -230 +230 @@
 #define XMLNS_CARBONS      "urn:xmpp:carbons:2"                                  /* XEP-0280 */
 #define XMLNS_FORWARDING   "urn:xmpp:forward:0"                                  /* XEP-0297 */
+#define XMLNS_HINTS        "urn:xmpp:hints"                                      /* XEP-0334 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
 #define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */