Changeset 3fbce97 for protocols/jabber/sasl.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

• protocols/jabber/sasl.c (modified) (7 diffs)

protocols/jabber/sasl.c

@@ -38 +38 @@
         "6C-Zgf7Tr7gEQTPlBhMUgo7R",
 };
-const struct oauth2_service oauth2_service_facebook =
-{
-        "https://www.facebook.com/dialog/oauth",
-        "https://graph.facebook.com/oauth/access_token",
-        "https://www.bitlbee.org/main.php/Facebook/oauth2.html",
-        "offline_access,xmpp_login",
-        "126828914005625",
-        "4b100f0f244d620bf3f15f8b217d4c32",
-};
 
 xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
@@ -54 +45 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_anonymous = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_anonymous = 0;
         int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE;
         GString *mechs;
@@ -89 +80 @@
                 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) {
                         sup_gtalk = 1;
-                } else if (c->text && g_strcasecmp(c->text, "X-FACEBOOK-PLATFORM") == 0) {
-                        sup_fb = 1;
                 }
 
@@ -101 +90 @@
 
         if (!want_oauth && !sup_plain && !sup_digest) {
-                if (!sup_gtalk && !sup_fb) {
+                if (!sup_gtalk) {
                         imcb_error(ic, "This server requires OAuth "
                                    "(supported schemes:%s)", mechs->str);
@@ -137 +126 @@
                 reply->text_len = strlen(reply->text);
                 g_free(s);
-        } else if (sup_fb && want_oauth) {
-                xt_add_attr(reply, "mechanism", "X-FACEBOOK-PLATFORM");
-                jd->flags |= JFLAG_SASL_FB;
         } else if (want_oauth) {
                 imcb_error(ic, "OAuth requested, but not supported by server");
@@ -154 +140 @@
                 xt_free_node(reply);
                 return XT_ABORT;
-        } else if (sup_digest) {
+        } else if (sup_digest && !(jd->ssl && sup_plain)) {
+                /* Only try DIGEST-MD5 if there's no SSL/TLS or if PLAIN isn't supported.
+                 * Which in practice means "don't bother with DIGEST-MD5 most of the time".
+                 * It's weak, pointless over TLS, and often breaks with some servers (hi openfire) */
+
                 xt_add_attr(reply, "mechanism", "DIGEST-MD5");
 
@@ -295 +285 @@
         dec = frombase64(node->text);
 
-        if (jd->flags & JFLAG_SASL_FB) {
-                /* New-style Facebook OAauth2 support. Instead of sending a refresh
-                   token, they just send an access token that should never expire. */
-                GSList *p_in = NULL, *p_out = NULL;
-                char time[33];
-
-                oauth_params_parse(&p_in, dec);
-                oauth_params_add(&p_out, "nonce", oauth_params_get(&p_in, "nonce"));
-                oauth_params_add(&p_out, "method", oauth_params_get(&p_in, "method"));
-                oauth_params_free(&p_in);
-
-                g_snprintf(time, sizeof(time), "%lld", (long long) (gettime() * 1000));
-                oauth_params_add(&p_out, "call_id", time);
-                oauth_params_add(&p_out, "api_key", oauth2_service_facebook.consumer_key);
-                oauth_params_add(&p_out, "v", "1.0");
-                oauth_params_add(&p_out, "format", "XML");
-                oauth_params_add(&p_out, "access_token", jd->oauth2_access_token);
-
-                reply = oauth_params_string(p_out);
-                oauth_params_free(&p_out);
-        } else if (!(s = sasl_get_part(dec, "rspauth"))) {
+        if (!(s = sasl_get_part(dec, "rspauth"))) {
                 /* See RFC 2831 for for information. */
                 md5_state_t A1, A2, H;