Changeset 3ddbd23c

Timestamp:

2015-07-29T21:48:14Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

69b94c3

Parents:

10d089d (diff), 73dd021 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/develop' into parson

Conflicts:

lib/json.c - Yep, no longer exists in the branch so not important.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (4 diffs)

doc/user-guide/commands.xml

@@ -1186 +1186 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="anonymous" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                This enables SASL ANONYMOUS login for jabber accounts, as specified by XEP-0175.
+                        </para>
+
+                        <para>
+                                With this setting enabled, if the server allows this method, a password isn't required and the username part of the JID is ignored (you can use anonymous@jabber.example.com). Servers will usually assign you a random numeric username instead.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>

protocols/jabber/jabber.c

@@ -85 +85 @@
                 set_setstr(&acc->set, "server", "chat.hipchat.com");
         } else {
-                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
+                /* this reuses set_eval_oauth, which clears the password */
+                set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
         }
 

protocols/jabber/s5bytestream.c

@@ -85 +85 @@
                 return jabber_bs_abort(bt, msg ": %s", strerror(errno)); }
 
-gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...);
+gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...) G_GNUC_PRINTF(2, 3);
 void jabber_bs_canceled(file_transfer_t *ft, char *reason);
 void jabber_bs_free_transfer(file_transfer_t *ft);

protocols/jabber/sasl.c

@@ -54 +54 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-        int want_oauth = FALSE, want_hipchat = FALSE;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_anonymous = 0;
+        int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE;
         GString *mechs;
 
@@ -74 +74 @@
         }
 
+        want_anonymous = set_getbool(&ic->acc->set, "anonymous");
         want_oauth = set_getbool(&ic->acc->set, "oauth");
         want_hipchat = (jd->flags & JFLAG_HIPCHAT);
@@ -84 +85 @@
                 } else if (c->text && g_strcasecmp(c->text, "DIGEST-MD5") == 0) {
                         sup_digest = 1;
+                } else if (c->text && g_strcasecmp(c->text, "ANONYMOUS") == 0) {
+                        sup_anonymous = 1;
                 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) {
                         sup_gtalk = 1;
@@ -139 +142 @@
         } else if (want_oauth) {
                 imcb_error(ic, "OAuth requested, but not supported by server");
+                imc_logout(ic, FALSE);
+                xt_free_node(reply);
+                return XT_ABORT;
+        } else if (want_anonymous && sup_anonymous) {
+                xt_add_attr(reply, "mechanism", "ANONYMOUS");
+
+                /* Well, that was easy. */
+        } else if (want_anonymous) {
+                imcb_error(ic, "Anonymous login requested, but not supported by server");
                 imc_logout(ic, FALSE);
                 xt_free_node(reply);