Changeset 0e4c3dd

Timestamp:

2015-02-21T06:18:21Z (9 years ago)

Author:

dequis <dx@…>

Children:

89db90e

Parents:

59c1fe7

Message:

Add hipchat support to the jabber module

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• hipchat.c (added)
• iq.c (modified) (2 diffs)
• jabber.h (modified) (4 diffs)
• sasl.c (modified) (5 diffs)

protocols/jabber/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o
 
 LFLAGS += -r

protocols/jabber/iq.c

@@ -27 +27 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
-static int jabber_iq_disco_server(struct im_connection *ic);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -861 +860 @@
                                                  struct xt_node *node, struct xt_node *orig);
 
-static int jabber_iq_disco_server(struct im_connection *ic)
+int jabber_iq_disco_server(struct im_connection *ic)
 {
         struct xt_node *node, *iq;

protocols/jabber/jabber.h

@@ -250 +250 @@
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
+/* Hipchat protocol extensions*/
+#define XMLNS_HIPCHAT         "http://hipchat.com"
+#define XMLNS_HIPCHAT_PROFILE "http://hipchat.com/protocol/profile"
+#define XMLNS_HIPCHAT_MUC     "http://hipchat.com/protocol/muc#room"
+
 /* jabber.c */
 void jabber_connect(struct im_connection *ic);
@@ -259 +264 @@
 int jabber_get_roster(struct im_connection *ic);
 int jabber_get_vcard(struct im_connection *ic, char *bare_jid);
+int jabber_iq_disco_muc(struct im_connection *ic, char *muc_server);
 int jabber_add_to_roster(struct im_connection *ic, const char *handle, const char *name, const char *group);
 int jabber_remove_from_roster(struct im_connection *ic, char *handle);
@@ -264 +270 @@
 xt_status jabber_iq_query_server(struct im_connection *ic, char *jid, char *xmlns);
 void jabber_iq_version_send(struct im_connection *ic, struct jabber_buddy *bud, void *data);
+int jabber_iq_disco_server(struct im_connection *ic);
 
 /* si.c */
@@ -357 +364 @@
 void jabber_chat_invite(struct groupchat *c, char *who, char *message);
 
+/* hipchat.c */
+int jabber_get_hipchat_profile(struct im_connection *ic);
+xt_status jabber_parse_hipchat_profile(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+xt_status hipchat_handle_success(struct im_connection *ic, struct xt_node *node);
+xt_status jabber_parse_muc_list(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+
 #endif

protocols/jabber/sasl.c

@@ -55 +55 @@
         char *s;
         int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-        int want_oauth = FALSE;
+        int want_oauth = FALSE, want_hipchat = FALSE;
         GString *mechs;
 
@@ -75 +75 @@
 
         want_oauth = set_getbool(&ic->acc->set, "oauth");
+        want_hipchat = (jd->subproto == JSUB_HIPCHAT);
 
         mechs = g_string_new("");
@@ -111 +112 @@
 
         reply = xt_new_node("auth", NULL, NULL);
-        xt_add_attr(reply, "xmlns", XMLNS_SASL);
+        if (!want_hipchat) {
+                xt_add_attr(reply, "xmlns", XMLNS_SASL);
+        } else {
+                xt_add_attr(reply, "xmlns", XMLNS_HIPCHAT);
+        }
 
         if (sup_gtalk && want_oauth) {
@@ -143 +148 @@
         } else if (sup_plain) {
                 int len;
-
-                xt_add_attr(reply, "mechanism", "PLAIN");
+                GString *gs;
+                char *username;
+
+                if (!want_hipchat) {
+                        xt_add_attr(reply, "mechanism", "PLAIN");
+                        username = jd->username;
+                } else {
+                        username = jd->me;
+                }
+
+                /* set an arbitrary initial size to avoid reallocations */
+                gs = g_string_sized_new(128);
 
                 /* With SASL PLAIN in XMPP, the text should be b64(\0user\0pass) */
-                len = strlen(jd->username) + strlen(ic->acc->pass) + 2;
-                s = g_malloc(len + 1);
-                s[0] = 0;
-                strcpy(s + 1, jd->username);
-                strcpy(s + 2 + strlen(jd->username), ic->acc->pass);
+                g_string_append_c(gs, '\0');
+                g_string_append(gs, username);
+                g_string_append_c(gs, '\0');
+                g_string_append(gs, ic->acc->pass);
+                if (want_hipchat) {
+                        /* Hipchat's variation adds \0resource at the end */
+                        g_string_append_c(gs, '\0');
+                        g_string_append(gs, set_getstr(&ic->acc->set, "resource"));
+                }
+
+                len = gs->len;
+                s = g_string_free(gs, FALSE);
+
                 reply->text = base64_encode((unsigned char *) s, len);
                 reply->text_len = strlen(reply->text);
@@ -397 +420 @@
                 imcb_log(ic, "Authentication finished");
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
+
+                if (jd->subproto == JSUB_HIPCHAT) {
+                        return hipchat_handle_success(ic, node);
+                }
         } else if (strcmp(node->name, "failure") == 0) {
                 imcb_error(ic, "Authentication failure");