Changeset 40cfbc5

Timestamp:

2015-04-28T13:47:48Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

70ec7ab, 9ed8175

Parents:

1493c4b

git-author:

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

git-committer:

dequis <dx@…> (28-04-15 13:47:48)

Message:

hipchat: Basic implementation: Auth, profile and mention names

This is enough to log in with their usernames, make 'chat add' based
groupchat joins slightly more smooth, and see mention names as nicks.

All the MUC list stuff is left out intentionally since that's not as
stable as I wish.

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• hipchat.c (added)
• iq.c (modified) (5 diffs)
• jabber.h (modified) (3 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)
@@ -374 +373 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
 {
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *query, *c;
         int initial = (orig != NULL);
@@ -388 +388 @@
                 char *name = xt_find_attr(c, "name");
                 char *sub = xt_find_attr(c, "subscription");
+                char *mention_name = xt_find_attr(c, "mention_name");
 
                 if (jid && sub) {
@@ -396 +397 @@
                                 if (name) {
                                         imcb_rename_buddy(ic, jid, name);
+                                }
+
+                                /* This could also be used to set the full name as nick for fb/gtalk,
+                                 * but i'm keeping the old (ugly?) default behavior just to be safe */
+                                if (mention_name && (jd->flags & JFLAG_HIPCHAT)) {
+                                        imcb_buddy_nick_hint(ic, jid, mention_name);
                                 }
                         } else if (strcmp(sub, "remove") == 0) {
@@ -855 +862 @@
                                                  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

@@ -236 +236 @@
 #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"
+
 /* jabber.c */
 void jabber_connect(struct im_connection *ic);
@@ -250 +254 @@
 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 */
@@ -342 +347 @@
 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);
+
 #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->flags & JFLAG_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->flags & JFLAG_HIPCHAT) {
+                        return hipchat_handle_success(ic, node);
+                }
         } else if (strcmp(node->name, "failure") == 0) {
                 imcb_error(ic, "Authentication failure");