Changeset e14b47b8

Timestamp:

2011-12-21T10:48:08Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ce199b7

Parents:

68286eb

Message:

Fix parsing of acc->pass. Use oauth_params_ functions instead of string
magic, fixes escaping issues.

Location:

protocols/jabber

Files:

• jabber.c (modified) (4 diffs)
• jabber.h (modified) (1 diff)
• sasl.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -32 +32 @@
 #include "bitlbee.h"
 #include "jabber.h"
+#include "oauth.h"
 #include "md5.h"
 
@@ -138 +139 @@
         if( set_getbool( &acc->set, "oauth" ) )
         {
+                GSList *p_in = NULL;
+                const char *tok;
+                
                 jd->fd = jd->r_inpa = jd->w_inpa = -1;
                 
@@ -147 +151 @@
                         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( strstr( acc->pass, "refresh_token=" ) )
+                if( ( tok = oauth_params_get( &p_in, "refresh_token" ) ) )
                 {
-                        sasl_oauth2_refresh( ic, acc->pass + 14 );
+                        sasl_oauth2_refresh( ic, tok );
                 }
                 /* If we don't have a refresh token, let's hope the access
                    token is still usable. */
-                else if( strstr( acc->pass, "access_token=" ) )
+                else if( ( tok = oauth_params_get( &p_in, "access_token" ) ) )
                 {
-                        sasl_oauth2_load_access_token( ic );
+                        jd->oauth2_access_token = g_strdup( tok );
                         jabber_connect( ic );
                 }
@@ -168 +174 @@
                         ic->flags |= OPT_SLOW_LOGIN;
                 }
+                
+                oauth_params_free( &p_in );
         }
         else

protocols/jabber/jabber.h

@@ -329 +329 @@
 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 );
-int sasl_oauth2_load_access_token( struct im_connection *ic );
 
 extern const struct oauth2_service oauth2_service_google;

protocols/jabber/sasl.c

@@ -512 +512 @@
 }
 
-int sasl_oauth2_load_access_token( struct im_connection *ic )
-{
-        struct jabber_data *jd = ic->proto_data;
-        GSList *p_in = NULL;
-        
-        oauth_params_parse( &p_in, ic->acc->pass );
-        jd->oauth2_access_token = g_strdup( oauth_params_get( &p_in, "access_token" ) );
-        oauth_params_free( &p_in );
-        
-        return jd->oauth2_access_token != NULL;
-}
-
 static void sasl_oauth2_got_token( gpointer data, const char *access_token, const char *refresh_token )
 {