Changeset 5f40da7 for protocols

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

Location:

protocols

Files:

• jabber/conference.c (modified) (2 diffs)
• jabber/iq.c (modified) (3 diffs)
• jabber/jabber.c (modified) (11 diffs)
• jabber/jabber.h (modified) (6 diffs)
• jabber/jabber_util.c (modified) (1 diff)
• jabber/sasl.c (modified) (11 diffs)
• msn/msn.h (modified) (1 diff)
• msn/msn_util.c (modified) (1 diff)
• msn/ns.c (modified) (4 diffs)
• msn/sb.c (modified) (3 diffs)
• nogaim.c (modified) (2 diffs)
• twitter/twitter.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -211 +211 @@
         struct xt_node *c;
         char *type = xt_find_attr( node, "type" );
+        struct jabber_data *jd = ic->proto_data;
         struct jabber_chat *jc;
         char *s;
@@ -252 +253 @@
                         if( bud == jc->me )
                         {
-                                bud->ext_jid = jabber_normalize( ic->acc->user );
+                                bud->ext_jid = g_strdup( jd->me );
                         }
                         else

protocols/jabber/iq.c

@@ -31 +31 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply = NULL;
         char *type, *s;
@@ -170 +171 @@
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                        int bare_len = strlen( ic->acc->user );
+                        int bare_len = strlen( jd->me );
                         
                         if( ( s = xt_find_attr( node, "from" ) ) == NULL ||
-                            ( strncmp( s, ic->acc->user, bare_len ) == 0 &&
+                            ( strncmp( s, jd->me, bare_len ) == 0 &&
                               ( s[bare_len] == 0 || s[bare_len] == '/' ) ) )
                         {
@@ -343 +344 @@
         {
                 c = xt_find_node( c->children, "jid" );
-                if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
-                    strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
+                if( !c || !c->text )
+                {
+                        /* Server is crap, but this is no disaster. */
+                }
+                else if( strncmp( jd->me, c->text, strlen( jd->me ) ) != 0 )
+                {
+                        s = strchr( c->text, '/' );
+                        if( s )
+                                *s = '\0';
+                        jabber_set_me( ic, c->text );
+                        imcb_log( ic, "Server claims your JID is `%s' instead of `%s'. "
+                                  "This mismatch may cause problems with groupchats "
+                                  "and possibly other things.",
+                                  c->text, ic->acc->user );
+                        if( s )
+                                *s = '/';
+                }
+                else if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
+                         strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
         }

protocols/jabber/jabber.c

@@ -32 +32 @@
 #include "bitlbee.h"
 #include "jabber.h"
+#include "oauth.h"
 #include "md5.h"
 
@@ -60 +61 @@
         s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
         
+        s = set_add( &acc->set, "oauth", "false", set_eval_oauth, acc );
+
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
         s = set_add( &acc->set, "port", str, set_eval_int, acc );
@@ -73 +76 @@
         s = set_add( &acc->set, "resource_select", "activity", NULL, acc );
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+        
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
@@ -84 +90 @@
         s = set_add( &acc->set, "tls_verify", "true", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
-        
-        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
-        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
 
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
@@ -102 +105 @@
         struct im_connection *ic = imcb_new( acc );
         struct jabber_data *jd = g_new0( struct jabber_data, 1 );
-        struct ns_srv_reply **srvl = NULL, *srv = NULL;
-        char *connect_to, *s;
-        int i;
+        char *s;
         
         /* For now this is needed in the _connected() handlers if using
@@ -114 +115 @@
         ic->proto_data = jd;
         
-        jd->username = g_strdup( acc->user );
-        jd->server = strchr( jd->username, '@' );
+        jabber_set_me( ic, acc->user );
         
         jd->fd = jd->r_inpa = jd->w_inpa = -1;
@@ -125 +125 @@
                 return;
         }
-        
-        /* So don't think of free()ing jd->server.. :-) */
-        *jd->server = 0;
-        jd->server ++;
         
         if( ( s = strchr( jd->server, '/' ) ) )
@@ -141 +137 @@
         }
         
-        /* This code isn't really pretty. Backwards compatibility never is... */
-        s = acc->server;
-        while( s )
-        {
-                static int had_port = 0;
-                
-                if( strncmp( s, "ssl", 3 ) == 0 )
-                {
-                        set_setstr( &acc->set, "ssl", "true" );
-                        
-                        /* Flush this part so that (if this was the first
-                           part of the server string) acc->server gets
-                           flushed. We don't want to have to do this another
-                           time. :-) */
-                        *s = 0;
-                        s ++;
-                        
-                        /* Only set this if the user didn't specify a custom
-                           port number already... */
-                        if( !had_port )
-                                set_setint( &acc->set, "port", 5223 );
-                }
-                else if( isdigit( *s ) )
-                {
-                        int i;
-                        
-                        /* The first character is a digit. It could be an
-                           IP address though. Only accept this as a port#
-                           if there are only digits. */
-                        for( i = 0; isdigit( s[i] ); i ++ );
-                        
-                        /* If the first non-digit character is a colon or
-                           the end of the string, save the port number
-                           where it should be. */
-                        if( s[i] == ':' || s[i] == 0 )
-                        {
-                                sscanf( s, "%d", &i );
-                                set_setint( &acc->set, "port", i );
-                                
-                                /* See above. */
-                                *s = 0;
-                                s ++;
-                        }
-                        
-                        had_port = 1;
-                }
-                
-                s = strchr( s, ':' );
-                if( s )
-                {
-                        *s = 0;
-                        s ++;
-                }
-        }
-        
         jd->node_cache = g_hash_table_new_full( g_str_hash, g_str_equal, NULL, jabber_cache_entry_free );
         jd->buddies = g_hash_table_new( g_str_hash, g_str_equal );
+        
+        if( set_getbool( &acc->set, "oauth" ) )
+        {
+                GSList *p_in = NULL;
+                const char *tok;
+                
+                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" ) )
+                        jd->oauth2_service = &oauth2_service_facebook;
+                else
+                        jd->oauth2_service = &oauth2_service_google;
+                
+                oauth_params_parse( &p_in, ic->acc->pass );
+                
+                /* First see if we have a refresh token, in which case any
+                   access token we *might* have has probably expired already
+                   anyway. */
+                if( ( tok = oauth_params_get( &p_in, "refresh_token" ) ) )
+                {
+                        sasl_oauth2_refresh( ic, tok );
+                }
+                /* If we don't have a refresh token, let's hope the access
+                   token is still usable. */
+                else if( ( tok = oauth_params_get( &p_in, "access_token" ) ) )
+                {
+                        jd->oauth2_access_token = g_strdup( tok );
+                        jabber_connect( ic );
+                }
+                /* If we don't have any, start the OAuth process now. Don't
+                   even open an XMPP connection yet. */
+                else
+                {
+                        sasl_oauth2_init( ic );
+                        ic->flags |= OPT_SLOW_LOGIN;
+                }
+                
+                oauth_params_free( &p_in );
+        }
+        else
+                jabber_connect( ic );
+}
+
+/* Separate this from jabber_login() so we can do OAuth first if necessary.
+   Putting this in io.c would probably be more correct. */
+void jabber_connect( struct im_connection *ic )
+{
+        account_t *acc = ic->acc;
+        struct jabber_data *jd = ic->proto_data;
+        int i;
+        char *connect_to;
+        struct ns_srv_reply **srvl = NULL, *srv = NULL;
         
         /* Figure out the hostname to connect to. */
@@ -322 +317 @@
         xt_free( jd->xt );
         
+        g_free( jd->oauth2_access_token );
         g_free( jd->away_message );
         g_free( jd->username );
+        g_free( jd->me );
         g_free( jd );
         
@@ -339 +336 @@
         if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
                 return jabber_write( ic, message, strlen( message ) );
+        
+        if( g_strcasecmp( who, JABBER_OAUTH_HANDLE ) == 0 &&
+            !( jd->flags & OPT_LOGGED_IN ) && jd->fd == -1 )
+        {
+                if( sasl_oauth2_get_refresh_token( ic, message ) )
+                {
+                        return 1;
+                }
+                else
+                {
+                        imcb_error( ic, "OAuth failure" );
+                        imc_logout( ic, TRUE );
+                        return 0;
+                }
+        }
         
         if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
@@ -491 +503 @@
 static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
 {
+        struct jabber_data *jd = c->ic->proto_data;
         struct jabber_chat *jc = c->data;
         gchar *msg_alt = NULL;
 
         if( msg == NULL )
-                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
+                msg_alt = g_strdup_printf( "%s invited you to %s", jd->me, jc->name );
         
         if( c && who )

protocols/jabber/jabber.h

@@ -47 +47 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
+        
+        JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */
 } jabber_flags_t;
 
@@ -92 +94 @@
         char *username;         /* USERNAME@server */
         char *server;           /* username@SERVER -=> server/domain, not hostname */
+        char *me;               /* bare jid */
+        
+        const struct oauth2_service *oauth2_service;
+        char *oauth2_access_token;
         
         /* After changing one of these two (or the priority setting), call
@@ -188 +194 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
+#define JABBER_OAUTH_HANDLE "jabber_oauth"
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the
@@ -232 +239 @@
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
+/* jabber.c */
+void jabber_connect( struct im_connection *ic );
+
 /* iq.c */
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data );
@@ -300 +310 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns );
 void jabber_error_free( struct jabber_error *err );
+gboolean jabber_set_me( struct im_connection *ic, const char *me );
 
 extern const struct jabber_away_state jabber_away_state_list[];
@@ -316 +327 @@
 xt_status sasl_pkt_result( struct xt_node *node, gpointer data );
 gboolean sasl_supported( struct im_connection *ic );
+void sasl_oauth2_init( struct im_connection *ic );
+int sasl_oauth2_get_refresh_token( struct im_connection *ic, const char *msg );
+int sasl_oauth2_refresh( struct im_connection *ic, const char *refresh_token );
+
+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

@@ -761 +761 @@
         g_free( err );
 }
+
+gboolean jabber_set_me( struct im_connection *ic, const char *me )
+{
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( strchr( me, '@' ) == NULL )
+                return FALSE;
+        
+        g_free( jd->username );
+        g_free( jd->me );
+        
+        jd->me = jabber_normalize( me );
+        jd->server = strchr( jd->me, '@' );
+        jd->username = g_strndup( jd->me, jd->server - jd->me );
+        jd->server ++;
+        
+        return TRUE;
+}

protocols/jabber/sasl.c

@@ -26 +26 @@
 #include "jabber.h"
 #include "base64.h"
+#include "oauth2.h"
+#include "oauth.h"
+
+const struct oauth2_service oauth2_service_google =
+{
+        "https://accounts.google.com/o/oauth2/auth",
+        "https://accounts.google.com/o/oauth2/token",
+        "urn:ietf:wg:oauth:2.0:oob",
+        "https://www.googleapis.com/auth/googletalk",
+        "783993391592.apps.googleusercontent.com",
+        "6C-Zgf7Tr7gEQTPlBhMUgo7R",
+};
+const struct oauth2_service oauth2_service_facebook =
+{
+        "https://www.facebook.com/dialog/oauth",
+        "https://graph.facebook.com/oauth/access_token",
+        "http://www.bitlbee.org/main.php/Facebook/oauth2.html",
+        "offline_access,xmpp_login",
+        "126828914005625",
+        "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 )
@@ -33 +63 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
+        int want_oauth = FALSE;
+        GString *mechs;
         
         if( !sasl_supported( ic ) )
@@ -52 +84 @@
         }
         
+        mechs = g_string_new( "" );
         c = node->children;
         while( ( c = xt_find_node( c, "mechanism" ) ) )
@@ -57 +90 @@
                 if( c->text && g_strcasecmp( c->text, "PLAIN" ) == 0 )
                         sup_plain = 1;
-                if( c->text && g_strcasecmp( c->text, "DIGEST-MD5" ) == 0 )
+                else if( c->text && g_strcasecmp( c->text, "DIGEST-MD5" ) == 0 )
                         sup_digest = 1;
+                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;
+                else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
+                        sup_ms = 1;
+                
+                if( c->text )
+                        g_string_append_printf( mechs, " %s", c->text );
                 
                 c = c->next;
@@ -65 +107 @@
         if( !sup_plain && !sup_digest )
         {
-                imcb_error( ic, "No known SASL authentication schemes supported" );
+                if( !sup_gtalk && !sup_fb && !sup_ms )
+                        imcb_error( ic, "This server requires OAuth "
+                                        "(supported schemes:%s)", mechs->str );
+                else
+                        imcb_error( ic, "BitlBee does not support any of the offered SASL "
+                                        "authentication schemes:%s", mechs->str );
                 imc_logout( ic, FALSE );
+                g_string_free( mechs, TRUE );
                 return XT_ABORT;
         }
+        g_string_free( mechs, TRUE );
         
         reply = xt_new_node( "auth", NULL, NULL );
         xt_add_attr( reply, "xmlns", XMLNS_SASL );
-        
-        if( sup_digest )
+        want_oauth = set_getbool( &ic->acc->set, "oauth" );
+        
+        if( sup_gtalk && want_oauth )
+        {
+                int len;
+                
+                /* X-OAUTH2 is, not *the* standard OAuth2 SASL/XMPP implementation.
+                   It's currently used by GTalk and vaguely documented on
+                   http://code.google.com/apis/cloudprint/docs/rawxmpp.html . */
+                xt_add_attr( reply, "mechanism", "X-OAUTH2" );
+                
+                len = strlen( jd->username ) + strlen( jd->oauth2_access_token ) + 2;
+                s = g_malloc( len + 1 );
+                s[0] = 0;
+                strcpy( s + 1, jd->username );
+                strcpy( s + 2 + strlen( jd->username ), jd->oauth2_access_token );
+                reply->text = base64_encode( (unsigned char *)s, len );
+                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 )
+        {
+                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" );
+                imc_logout( ic, FALSE );
+                xt_free_node( reply );
+                return XT_ABORT;
+        }
+        else if( sup_digest )
         {
                 xt_add_attr( reply, "mechanism", "DIGEST-MD5" );
@@ -96 +182 @@
         }
         
-        if( !jabber_write_packet( ic, reply ) )
+        if( reply && !jabber_write_packet( ic, reply ) )
         {
                 xt_free_node( reply );
@@ -197 +283 @@
         struct im_connection *ic = data;
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *reply = NULL;
+        struct xt_node *reply_pkt = NULL;
         char *nonce = NULL, *realm = NULL, *cnonce = NULL;
         unsigned char cnonce_bin[30];
         char *digest_uri = NULL;
         char *dec = NULL;
-        char *s = NULL;
+        char *s = NULL, *reply = NULL;
         xt_status ret = XT_ABORT;
         
@@ -210 +296 @@
         dec = frombase64( node->text );
         
-        if( !( s = sasl_get_part( dec, "rspauth" ) ) )
+        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" ) ) )
         {
                 /* See RFC 2831 for for information. */
@@ -271 +379 @@
                 
                 /* Now build the SASL response string: */
-                g_free( dec );
-                dec = g_strdup_printf( "username=\"%s\",realm=\"%s\",nonce=\"%s\",cnonce=\"%s\","
-                                       "nc=%08x,qop=auth,digest-uri=\"%s\",response=%s,charset=%s",
-                                       jd->username, realm, nonce, cnonce, 1, digest_uri, Hh, "utf-8" );
-                s = tobase64( dec );
+                reply = g_strdup_printf( "username=\"%s\",realm=\"%s\",nonce=\"%s\",cnonce=\"%s\","
+                                         "nc=%08x,qop=auth,digest-uri=\"%s\",response=%s,charset=%s",
+                                         jd->username, realm, nonce, cnonce, 1, digest_uri, Hh, "utf-8" );
         }
         else
         {
                 /* We found rspauth, but don't really care... */
-                g_free( s );
-                s = NULL;
-        }
-        
-        reply = xt_new_node( "response", s, NULL );
-        xt_add_attr( reply, "xmlns", XMLNS_SASL );
-        
-        if( !jabber_write_packet( ic, reply ) )
+        }
+        
+        s = reply ? tobase64( reply ) : NULL;
+        reply_pkt = xt_new_node( "response", s, NULL );
+        xt_add_attr( reply_pkt, "xmlns", XMLNS_SASL );
+        
+        if( !jabber_write_packet( ic, reply_pkt ) )
                 goto silent_error;
         
@@ -301 +406 @@
         g_free( cnonce );
         g_free( nonce );
+        g_free( reply );
         g_free( realm );
         g_free( dec );
         g_free( s );
-        xt_free_node( reply );
+        xt_free_node( reply_pkt );
         
         return ret;
@@ -347 +453 @@
         return ( jd->xt && jd->xt->root && xt_find_attr( jd->xt->root, "version" ) ) != 0;
 }
+
+void sasl_oauth2_init( struct im_connection *ic )
+{
+        struct jabber_data *jd = ic->proto_data;
+        char *msg, *url;
+        
+        imcb_log( ic, "Starting OAuth authentication" );
+        
+        /* Temporary contact, just used to receive the OAuth response. */
+        imcb_add_buddy( ic, JABBER_OAUTH_HANDLE, NULL );
+        url = oauth2_url( jd->oauth2_service );
+        msg = g_strdup_printf( "Open this URL in your browser to authenticate: %s", url );
+        imcb_buddy_msg( ic, JABBER_OAUTH_HANDLE, msg, 0, 0 );
+        imcb_buddy_msg( ic, JABBER_OAUTH_HANDLE, "Respond to this message with the returned "
+                                                 "authorization token.", 0, 0 );
+        
+        g_free( msg );
+        g_free( url );
+}
+
+static gboolean sasl_oauth2_remove_contact( gpointer data, gint fd, b_input_condition cond )
+{
+        struct im_connection *ic = data;
+        if( g_slist_find( jabber_connections, ic ) )
+                imcb_remove_buddy( ic, JABBER_OAUTH_HANDLE, NULL );
+        return FALSE;
+}
+
+static void sasl_oauth2_got_token( gpointer data, const char *access_token, const char *refresh_token );
+
+int sasl_oauth2_get_refresh_token( struct im_connection *ic, const char *msg )
+{
+        struct jabber_data *jd = ic->proto_data;
+        char *code;
+        int ret;
+        
+        imcb_log( ic, "Requesting OAuth access token" );
+        
+        /* Don't do it here because the caller may get confused if the contact
+           we're currently sending a message to is deleted. */
+        b_timeout_add( 1, sasl_oauth2_remove_contact, ic );
+        
+        code = g_strdup( msg );
+        g_strstrip( code );
+        ret = oauth2_access_token( jd->oauth2_service, OAUTH2_AUTH_CODE,
+                                   code, sasl_oauth2_got_token, ic );
+        
+        g_free( code );
+        return ret;
+}
+
+int sasl_oauth2_refresh( struct im_connection *ic, const char *refresh_token )
+{
+        struct jabber_data *jd = ic->proto_data;
+        
+        return oauth2_access_token( jd->oauth2_service, OAUTH2_AUTH_REFRESH,
+                                    refresh_token, sasl_oauth2_got_token, ic );
+}
+
+static void sasl_oauth2_got_token( gpointer data, const char *access_token, const char *refresh_token )
+{
+        struct im_connection *ic = data;
+        struct jabber_data *jd;
+        GSList *auth = NULL;
+        
+        if( g_slist_find( jabber_connections, ic ) == NULL )
+                return;
+        
+        jd = ic->proto_data;
+        
+        if( access_token == NULL )
+        {
+                imcb_error( ic, "OAuth failure (missing access token)" );
+                imc_logout( ic, TRUE );
+                return;
+        }
+        
+        oauth_params_parse( &auth, ic->acc->pass );
+        if( refresh_token )
+                oauth_params_set( &auth, "refresh_token", refresh_token );
+        if( access_token )
+                oauth_params_set( &auth, "access_token", access_token );
+        
+        g_free( ic->acc->pass );
+        ic->acc->pass = oauth_params_string( auth );
+        oauth_params_free( &auth );
+        
+        g_free( jd->oauth2_access_token );
+        jd->oauth2_access_token = g_strdup( access_token );
+        
+        jabber_connect( ic );
+}

protocols/msn/msn.h

@@ -234 +234 @@
 int msn_buddy_list_remove( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group );
 void msn_buddy_ask( bee_user_t *bu );
-char *msn_findheader( char *text, char *header, int len );
 char **msn_linesplit( char *line );
 int msn_handler( struct msn_handler_data *h );

protocols/msn/msn_util.c

@@ -226 +226 @@
                     bu->handle, bu->fullname );
         imcb_ask( bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
-}
-
-char *msn_findheader( char *text, char *header, int len )
-{
-        int hlen = strlen( header ), i;
-        char *ret;
-        
-        if( len == 0 )
-                len = strlen( text );
-        
-        i = 0;
-        while( ( i + hlen ) < len )
-        {
-                /* Maybe this is a bit over-commented, but I just hate this part... */
-                if( g_strncasecmp( text + i, header, hlen ) == 0 )
-                {
-                        /* Skip to the (probable) end of the header */
-                        i += hlen;
-                        
-                        /* Find the first non-[: \t] character */
-                        while( i < len && ( text[i] == ':' || text[i] == ' ' || text[i] == '\t' ) ) i ++;
-                        
-                        /* Make sure we're still inside the string */
-                        if( i >= len ) return( NULL );
-                        
-                        /* Save the position */
-                        ret = text + i;
-                        
-                        /* Search for the end of this line */
-                        while( i < len && text[i] != '\r' && text[i] != '\n' ) i ++;
-                        
-                        /* Make sure we're still inside the string */
-                        if( i >= len ) return( NULL );
-                        
-                        /* Copy the found data */
-                        return( g_strndup( ret, text + i - ret ) );
-                }
-                
-                /* This wasn't the header we were looking for, skip to the next line. */
-                while( i < len && ( text[i] != '\r' && text[i] != '\n' ) ) i ++;
-                while( i < len && ( text[i] == '\r' || text[i] == '\n' ) ) i ++;
-                
-                /* End of headers? */
-                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
-                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
-                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
-                {
-                        break;
-                }
-        }
-        
-        return( NULL );
 }
 

protocols/msn/ns.c

@@ -609 +609 @@
                 if( g_strcasecmp( cmd[1], "Hotmail" ) == 0 )
                 {
-                        char *ct = msn_findheader( msg, "Content-Type:", msglen );
+                        char *ct = get_rfc822_header( msg, "Content-Type:", msglen );
                         
                         if( !ct )
@@ -622 +622 @@
                                         return( 1 );
                                 
-                                mtype = msn_findheader( body, "Type:", blen );
-                                arg1 = msn_findheader( body, "Arg1:", blen );
+                                mtype = get_rfc822_header( body, "Type:", blen );
+                                arg1 = get_rfc822_header( body, "Arg1:", blen );
                                 
                                 if( mtype && strcmp( mtype, "1" ) == 0 )
@@ -642 +642 @@
                                 if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
-                                        char *folders = msn_findheader( body, "Folders-Unread:", blen );
+                                        char *inbox = get_rfc822_header( body, "Inbox-Unread:", blen );
+                                        char *folders = get_rfc822_header( body, "Folders-Unread:", blen );
 
                                         if( inbox && folders )
@@ -656 +656 @@
                                 if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *from = msn_findheader( body, "From-Addr:", blen );
-                                        char *fromname = msn_findheader( body, "From:", blen );
+                                        char *from = get_rfc822_header( body, "From-Addr:", blen );
+                                        char *fromname = get_rfc822_header( body, "From:", blen );
                                         
                                         if( from && fromname )

protocols/msn/sb.c

@@ -682 +682 @@
         if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                char *ct = msn_findheader( msg, "Content-Type:", msglen );
+                char *ct = get_rfc822_header( msg, "Content-Type:", msglen );
                 
                 if( !ct )
@@ -711 +711 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
-                        char *command = msn_findheader( body, "Invitation-Command:", blen );
-                        char *cookie = msn_findheader( body, "Invitation-Cookie:", blen );
+                        char *command = get_rfc822_header( body, "Invitation-Command:", blen );
+                        char *cookie = get_rfc822_header( body, "Invitation-Cookie:", blen );
                         unsigned int icookie;
                         
@@ -750 +750 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )
                 {
-                        char *who = msn_findheader( msg, "TypingUser:", msglen );
+                        char *who = get_rfc822_header( msg, "TypingUser:", msglen );
                         
                         if( who )

protocols/nogaim.c

@@ -327 +327 @@
         imcb_log( ic, "Signing off.." );
         
+        /* TBH I don't remember anymore why I didn't just use ic->acc... */
+        for( a = bee->accounts; a; a = a->next )
+                if( a->ic == ic )
+                        break;
+        
+        if( a && !allow_reconnect && !( ic->flags & OPT_LOGGED_IN ) &&
+            set_getbool( &a->set, "oauth" ) )
+        {
+                /* If this account supports OAuth, we're not logged in yet and
+                   not allowed to retry, assume there were auth issues. Give a
+                   helpful message on what might be necessary to fix this. */
+                imcb_log( ic, "If you're having problems logging in, try re-requesting "
+                          "an OAuth token: account %s set password \"\"", a->tag );
+        }
+        
         for( l = bee->users; l; )
         {
@@ -347 +362 @@
         
         query_del_by_conn( (irc_t*) ic->bee->ui_data, ic );
-        
-        for( a = bee->accounts; a; a = a->next )
-                if( a->ic == ic )
-                        break;
         
         if( !a )

protocols/twitter/twitter.c

@@ -220 +220 @@
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
                 def_url = IDENTICA_API_URL;
-                def_oauth = "false";
+                def_oauth = "true";
         }
 
@@ -240 +240 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
+        s = set_add(&acc->set, "oauth", def_oauth, set_eval_oauth, acc);
+
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
         s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
-
-        s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
 }