Changeset fa8f57b for protocols/jabber

Timestamp:

2015-11-21T03:01:05Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2f8e3ca

Parents:

8fdeaa5

git-author:

dequis <dx@…> (21-11-15 02:04:06)

git-committer:

dequis <dx@…> (21-11-15 03:01:05)

Message:

jabber: Implement carbons (XEP-0280)

"Message carbons" (XEP-0280) is a server feature to get copies of
outgoing messages sent from other clients connected to the same account.
It's not widely supported by most public XMPP servers (easier if you
host your own), but this will probably change in the next few years.

This is enabled by default if the server supports it. It can also be
disabled with the "carbons" account setting.

Loosely based on a patch by kormat from trac ticket 1021. (Thanks!)
I moved stuff around, simplified things, fixed a few bugs, and used the
new self-messages feature.

Location:

protocols/jabber

Files:

• iq.c (modified) (4 diffs)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• message.c (modified) (5 diffs)

protocols/jabber/iq.c

@@ -28 +28 @@
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_gmail_handle_new(struct im_connection *ic, struct xt_node *node);
+static xt_status jabber_iq_carbons_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -118 +119 @@
                                                    XMLNS_BYTESTREAMS,
                                                    XMLNS_FILETRANSFER,
+                                                   XMLNS_CARBONS,
                                                    NULL };
                         const char **f;
@@ -1004 +1006 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *id;
-
-        if ((id = xt_find_path(node, "query/identity"))) {
+        struct xt_node *query, *id;
+
+        if (!(query = xt_find_node(node->children, "query"))) {
+                return XT_HANDLED;
+        }
+
+        if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_CARBONS) &&
+            set_getbool(&ic->acc->set, "carbons")) {
+
+                struct xt_node *enable, *iq;
+
+                enable = xt_new_node("enable", NULL, NULL);
+                xt_add_attr(enable, "xmlns", XMLNS_CARBONS);
+                iq = jabber_make_packet("iq", "set", NULL, enable);
+
+                jabber_cache_add(ic, iq, jabber_iq_carbons_response);
+                jabber_write_packet(ic, iq);
+        }
+
+        if ((id = xt_find_node(query->children, "identity"))) {
                 char *cat, *type, *name;
 
@@ -1023 +1042 @@
         return XT_HANDLED;
 }
+
+static xt_status jabber_iq_carbons_response(struct im_connection *ic,
+                                            struct xt_node *node, struct xt_node *orig)
+{
+        struct jabber_error *err;
+
+        if ((err = jabber_error_parse(xt_find_node(node->children, "error"), XMLNS_STANZA_ERROR))) {
+                imcb_error(ic, "Error enabling carbons: %s%s%s",
+                           err->code, err->text ? ": " : "", err->text ? err->text : "");
+                jabber_error_free(err);
+        } else {
+                imcb_log(ic, "Carbons enabled");
+        }
+
+        return XT_HANDLED;
+}

protocols/jabber/jabber.c

@@ -113 +113 @@
         s = set_add(&acc->set, "mail_notifications_handle", NULL, NULL, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+
+        s = set_add(&acc->set, "carbons", "true", set_eval_bool, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |

protocols/jabber/jabber.h

@@ -228 +228 @@
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
 #define XMLNS_GMAILNOTIFY  "google:mail:notify"                                  /* Not a XEP */
+#define XMLNS_CARBONS      "urn:xmpp:carbons:2"                                  /* XEP-0280 */
+#define XMLNS_FORWARDING   "urn:xmpp:forward:0"                                  /* XEP-0297 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
 #define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */

protocols/jabber/message.c

@@ -24 +24 @@
 #include "jabber.h"
 
-xt_status jabber_pkt_message(struct xt_node *node, gpointer data)
+static xt_status jabber_pkt_message_normal(struct xt_node *node, gpointer data, gboolean carbons_sent)
 {
         struct im_connection *ic = data;
-        char *from = xt_find_attr(node, "from");
+        char *from = xt_find_attr(node, carbons_sent ? "to" : "from");
         char *type = xt_find_attr(node, "type");
         char *id = xt_find_attr(node, "id");
@@ -39 +39 @@
         }
 
-        if (request && id && g_strcmp0(type, "groupchat") != 0) {
+        if (request && id && g_strcmp0(type, "groupchat") != 0 && !carbons_sent) {
                 /* Send a message receipt (XEP-0184), looking like this:
                  * <message from='...' id='...' to='...'>
@@ -128 +128 @@
                 if (fullmsg->len > 0) {
                         imcb_buddy_msg(ic, from, fullmsg->str,
-                                       0, jabber_get_timestamp(node));
+                                       carbons_sent ? OPT_SELFMESSAGE : 0, jabber_get_timestamp(node));
                 }
                 if (room) {
@@ -137 +137 @@
 
                 /* Handling of incoming typing notifications. */
-                if (bud == NULL) {
-                        /* Can't handle these for unknown buddies. */
+                if (bud == NULL || carbons_sent) {
+                        /* Can't handle these for unknown buddies.
+                           And ignore them if it's just carbons */
                 } else if (xt_find_node(node->children, "composing")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
@@ -162 +163 @@
         return XT_HANDLED;
 }
+
+static xt_status jabber_carbons_message(struct xt_node *node, gpointer data)
+{
+        struct im_connection *ic = data;
+        struct xt_node *wrap, *fwd, *msg;
+        gboolean carbons_sent;
+
+        if ((wrap = xt_find_node(node->children, "received"))) {
+                carbons_sent = FALSE;
+        } else if ((wrap = xt_find_node(node->children, "sent"))) {
+                carbons_sent = TRUE;
+        }
+
+        if (wrap == NULL || g_strcmp0(xt_find_attr(wrap, "xmlns"), XMLNS_CARBONS) != 0) {
+                return XT_NEXT;
+        }
+
+        if (!(fwd = xt_find_node(wrap->children, "forwarded")) ||
+             (g_strcmp0(xt_find_attr(fwd, "xmlns"), XMLNS_FORWARDING) != 0) ||
+            !(msg = xt_find_node(fwd->children, "message"))) {
+                imcb_log(ic, "Error: Invalid carbons message received");
+                return XT_ABORT;
+        }
+
+        return jabber_pkt_message_normal(msg, data, carbons_sent);
+}
+
+xt_status jabber_pkt_message(struct xt_node *node, gpointer data)
+{
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
+        char *from = xt_find_attr(node, "from");
+
+        if (jabber_compare_jid(jd->me, from)) {    /* Probably a Carbons message */
+                xt_status st = jabber_carbons_message(node, data);
+                if (st == XT_HANDLED || st == XT_ABORT) {
+                        return st;
+                }
+        }
+        return jabber_pkt_message_normal(node, data, FALSE);
+}