Changeset 9ead105 for protocols

Timestamp:

2014-10-17T22:37:41Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fef97af

Parents:

4f7255d (diff), 46511b3 (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:

Bunch of merges from dx.

Location:

protocols/jabber

Files:

• io.c (modified) (1 diff)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (2 diffs)
• jabber_util.c (modified) (1 diff)
• sasl.c (modified) (5 diffs)

protocols/jabber/io.c

@@ -506 +506 @@
                 allow_reconnect = FALSE;
         }
+        else if( strcmp( err->code, "not-authorized" ) == 0 )
+        {
+                imcb_error( ic, "Not authorized" );
+                allow_reconnect = FALSE;
+        }
         else
         {

protocols/jabber/jabber.c

@@ -148 +148 @@
                 jd->fd = jd->r_inpa = jd->w_inpa = -1;
                 
-                if( strstr( jd->server, ".live.com" ) )
-                        jd->oauth2_service = &oauth2_service_mslive;
-                else if( strstr( jd->server, ".facebook.com" ) )
+                if( strstr( jd->server, ".facebook.com" ) )
                         jd->oauth2_service = &oauth2_service_facebook;
                 else

protocols/jabber/jabber.h

@@ -229 +229 @@
 #define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
 #define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
-#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_DELAY_OLD    "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
@@ -338 +339 @@
 extern const struct oauth2_service oauth2_service_google;
 extern const struct oauth2_service oauth2_service_facebook;
-extern const struct oauth2_service oauth2_service_mslive;
 
 /* conference.c */

protocols/jabber/jabber_util.c

@@ -726 +726 @@
         char *s = NULL;
         struct tm tp;
-        
-        for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
-        {
-                if( ( s = xt_find_attr( c, "xmlns" ) ) && strcmp( s, XMLNS_DELAY ) == 0 )
-                        break;
-        }
-        
-        if( !c || !( s = xt_find_attr( c, "stamp" ) ) )
-                return 0;
+        gboolean is_old = TRUE;
+        const char *format;
+
+        /* XEP-0091 has <x> */
+        c = xt_find_node_by_attr( xt->children, "x", "xmlns", XMLNS_DELAY_OLD );
+
+        if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+                is_old = FALSE;
+
+                /* XEP-0203 has <delay> */
+                c = xt_find_node_by_attr( xt->children, "delay", "xmlns", XMLNS_DELAY );
+                if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+                        return 0;
+                }
+        }
         
         memset( &tp, 0, sizeof( tp ) );
-        if( sscanf( s, "%4d%2d%2dT%2d:%2d:%2d", &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
-                                                &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
+
+        /* The other main difference between XEPs is the timestamp format */
+        format = (is_old) ? "%4d%2d%2dT%2d:%2d:%2d" : "%4d-%2d-%2dT%2d:%2d:%2dZ";
+
+        if( sscanf( s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
+                               &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
                 return 0;
         

protocols/jabber/sasl.c

@@ -47 +47 @@
         "4b100f0f244d620bf3f15f8b217d4c32",
 };
-const struct oauth2_service oauth2_service_mslive =
-{
-        "https://oauth.live.com/authorize",
-        "https://oauth.live.com/token",
-        "http://www.bitlbee.org/main.php/Messenger/oauth2.html",
-        "wl.offline_access%20wl.messenger",
-        "000000004C06FCD1",
-        "IRKlBPzJJAWcY-TbZjiTEJu9tn7XCFaV",
-};
 
 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
@@ -63 +54 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
         int want_oauth = FALSE;
         GString *mechs;
@@ -98 +89 @@
                 else if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 )
                         sup_fb = 1;
-                else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
-                        sup_ms = 1;
                 
                 if( c->text )
@@ -109 +98 @@
         if( !want_oauth && !sup_plain && !sup_digest )
         {
-                if( !sup_gtalk && !sup_fb && !sup_ms )
+                if( !sup_gtalk && !sup_fb )
                         imcb_error( ic, "This server requires OAuth "
                                         "(supported schemes:%s)", mechs->str );
@@ -141 +130 @@
                 reply->text_len = strlen( reply->text );
                 g_free( s );
-        }
-        else if( sup_ms && want_oauth )
-        {
-                xt_add_attr( reply, "mechanism", "X-MESSENGER-OAUTH2" );
-                reply->text = g_strdup( jd->oauth2_access_token );
-                reply->text_len = strlen( jd->oauth2_access_token );
         }
         else if( sup_fb && want_oauth )