Changeset 18c6d36

Timestamp:

2011-12-18T19:25:44Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

64b6635

Parents:

6e9ae72

Message:

More generic OAuth support now. Should work well for all GTalk accounts now
and somewhat for MS Messenger. The fb part needs different parsing of the
authorize request, and possibly some other work.

Files:

• lib/oauth2.c (modified) (2 diffs)
• lib/oauth2.h (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (2 diffs)
• protocols/jabber/sasl.c (modified) (10 diffs)

lib/oauth2.c

@@ -28 +28 @@
 #include "url.h"
 
-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",
-        "783993391592.apps.googleusercontent.com",
-        "6C-Zgf7Tr7gEQTPlBhMUgo7R",
-};
-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/fb.html",
-        "126828914005625",
-        "4b100f0f244d620bf3f15f8b217d4c32",
-};
-
-char *oauth2_url( const struct oauth2_service *sp, const char *scope )
+char *oauth2_url( const struct oauth2_service *sp )
 {
         return g_strconcat( sp->auth_url,
-                            "?scope=", scope,
+                            "?scope=", sp->scope,
                             "&response_type=code"
                             "&redirect_uri=", sp->redirect_url, 
@@ -121 +104 @@
         char *atoken = NULL, *rtoken = NULL;
         
+        if( getenv( "BITLBEE_DEBUG" ) && req->reply_body )
+                printf( "%s\n", req->reply_body );
+        
         if( req->status_code == 200 )
         {
                 atoken = oauth2_json_dumb_get( req->reply_body, "access_token" );
                 rtoken = oauth2_json_dumb_get( req->reply_body, "refresh_token" );
+                if( getenv( "BITLBEE_DEBUG" ) )
+                        printf( "Extracted atoken=%s rtoken=%s\n", atoken, rtoken );
         }
         cb_data->func( cb_data->data, atoken, rtoken );

lib/oauth2.h

@@ -32 +32 @@
         char *token_url;
         char *redirect_url;
+        char *scope;
         char *consumer_key;
         char *consumer_secret;
 };
-
-/* Currently suitable for authenticating to Google Talk only, and only for
-   accounts that have 2-factor authorization enabled. */
-extern struct oauth2_service oauth2_service_google;
-
-extern struct oauth2_service oauth2_service_facebook;
 
 #define OAUTH2_AUTH_CODE "authorization_code"
@@ -47 +42 @@
 /* Generate a URL the user should open in his/her browser to get an
    authorization code. */
-char *oauth2_url( const struct oauth2_service *sp, const char *scope );
+char *oauth2_url( const struct oauth2_service *sp );
 
 /* Exchanges an auth code or refresh token for an access token.

protocols/jabber/jabber.c

@@ -144 +144 @@
         {
                 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;
                 
                 /* For the first login with OAuth, we have to authenticate via the browser.

protocols/jabber/jabber.h

@@ -95 +95 @@
         char *server;           /* username@SERVER -=> server/domain, not hostname */
         
+        const struct oauth2_service *oauth2_service;
         char *oauth2_access_token;
         
@@ -327 +328 @@
 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 */
 struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password );

protocols/jabber/sasl.c

@@ -29 +29 @@
 #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.messenger",
+        "000000004C06FCD1",
+        "IRKlBPzJJAWcY-TbZjiTEJu9tn7XCFaV",
+};
+
 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
 {
@@ -35 +63 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_oauth2 = 0, sup_fb = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
+        int want_oauth = FALSE;
         
         if( !sasl_supported( ic ) )
@@ -62 +91 @@
                         sup_digest = 1;
                 if( c->text && g_strcasecmp( c->text, "X-OAUTH2" ) == 0 )
-                        sup_oauth2 = 1;
+                        sup_gtalk = 1;
                 if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 )
                         sup_fb = 1;
+                if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
+                        sup_ms = 1;
                 
                 c = c->next;
         }
         
-        if( !sup_plain && !sup_digest )
+        if( !sup_plain && !sup_digest && !sup_gtalk && !sup_fb && !sup_ms )
         {
                 imcb_error( ic, "No known SASL authentication schemes supported" );
@@ -78 +109 @@
         reply = xt_new_node( "auth", NULL, NULL );
         xt_add_attr( reply, "xmlns", XMLNS_SASL );
-        
-        if( set_getbool( &ic->acc->set, "oauth" ) )
+        want_oauth = set_getbool( &ic->acc->set, "oauth" );
+        
+        if( sup_gtalk && want_oauth )
         {
                 int len;
-                
-                if( !sup_oauth2 )
-                {
-                        imcb_error( ic, "OAuth requested, but not supported by server" );
-                        imc_logout( ic, FALSE );
-                        xt_free_node( reply );
-                        return XT_ABORT;
-                }
                 
                 /* X-OAUTH2 is, not *the* standard OAuth2 SASL/XMPP implementation.
@@ -105 +129 @@
                 g_free( s );
         }
-        else if( sup_fb && strstr( ic->acc->pass, "session_key=" ) )
+        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 && strstr( ic->acc->pass, "session_key=" ) )
         {
                 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 )
@@ -428 +465 @@
 void sasl_oauth2_init( struct im_connection *ic )
 {
+        struct jabber_data *jd = ic->proto_data;
         char *msg, *url;
         
@@ -434 +472 @@
         /* Temporary contact, just used to receive the OAuth response. */
         imcb_add_buddy( ic, "jabber_oauth", NULL );
-        url = oauth2_url( &oauth2_service_google,
-                          "https://www.googleapis.com/auth/googletalk" );
+        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", msg, 0, 0 );
@@ -457 +494 @@
 int sasl_oauth2_get_refresh_token( struct im_connection *ic, const char *msg )
 {
+        struct jabber_data *jd = ic->proto_data;
         char *code;
         int ret;
@@ -468 +506 @@
         code = g_strdup( msg );
         g_strstrip( code );
-        ret = oauth2_access_token( &oauth2_service_google, OAUTH2_AUTH_CODE,
+        ret = oauth2_access_token( jd->oauth2_service, OAUTH2_AUTH_CODE,
                                    code, sasl_oauth2_got_token, ic );
         
@@ -477 +515 @@
 int sasl_oauth2_refresh( struct im_connection *ic, const char *refresh_token )
 {
-        return oauth2_access_token( &oauth2_service_google, OAUTH2_AUTH_REFRESH,
+        struct jabber_data *jd = ic->proto_data;
+        
+        return oauth2_access_token( jd->oauth2_service, OAUTH2_AUTH_REFRESH,
                                     refresh_token, sasl_oauth2_got_token, ic );
 }