Changeset 18dbb20

Timestamp:

2010-04-27T22:42:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0bff877

Parents:

ee84bdb

Message:

Valgrind cleanup.

Files:

• lib/oauth.c (modified) (11 diffs)
• lib/oauth.h (modified) (4 diffs)
• protocols/twitter/twitter.c (modified) (6 diffs)

lib/oauth.c

@@ -225 +225 @@
 }
 
+void oauth_info_free( struct oauth_info *info )
+{
+        if( info )
+        {
+                g_free( info->auth_params );
+                g_free( info->request_token );
+                g_free( info->access_token );
+                g_free( info );
+        }
+}
+
 static void oauth_add_default_params( GSList **params )
 {
@@ -286 +297 @@
 static void oauth_request_token_done( struct http_request *req );
 
-void *oauth_request_token( const char *url, oauth_cb func, void *data )
+struct oauth_info *oauth_request_token( const char *url, oauth_cb func, void *data )
 {
         struct oauth_info *st = g_new0( struct oauth_info, 1 );
@@ -296 +307 @@
         oauth_params_add( &params, "oauth_callback", "oob" );
         
-        return oauth_post_request( url, NULL, oauth_request_token_done, st );
+        if( !oauth_post_request( url, &params, oauth_request_token_done, st ) )
+        {
+                oauth_info_free( st );
+                return NULL;
+        }
+        
+        return st;
 }
 
@@ -316 +333 @@
         
         st->stage = OAUTH_REQUEST_TOKEN;
-        st->func( st );
+        if( !st->func( st ) )
+                oauth_info_free( st );
 }
 
 static void oauth_access_token_done( struct http_request *req );
 
-void *oauth_access_token( const char *url, const char *pin, struct oauth_info *st )
+void oauth_access_token( const char *url, const char *pin, struct oauth_info *st )
 {
         GSList *params = NULL;
@@ -328 +346 @@
         oauth_params_add( &params, "oauth_verifier", pin );
         
-        return oauth_post_request( url, &params, oauth_access_token_done, st );
+        if( !oauth_post_request( url, &params, oauth_access_token_done, st ) )
+                oauth_info_free( st );
 }
 
@@ -337 +356 @@
         if( req->status_code == 200 )
         {
-                GSList *params;
+                GSList *params = NULL;
                 const char *token, *token_secret;
                 
@@ -350 +369 @@
         st->stage = OAUTH_ACCESS_TOKEN;
         st->func( st );
+        oauth_info_free( st );
 }
 
@@ -358 +378 @@
         GString *ret = NULL;
         
+        /* First, get the two pieces of info from the access token that we need. */
         oauth_params_parse( &params, access_token );
         if( params == NULL )
                 goto err;
+        
+        /* Pick out the token secret, we shouldn't include it but use it for signing. */
         token_secret = g_strdup( oauth_params_get( &params, "oauth_token_secret" ) );
         if( token_secret == NULL )
@@ -368 +391 @@
         oauth_add_default_params( &params );
         
+        /* Start building the OAuth header. 'key="value", '... */
         ret = g_string_new( "OAuth " );
         for( l = params; l; l = l->next )
@@ -387 +411 @@
         }
         
+        /* Now, before generating the signature, add GET/POST arguments to params
+           since they should be included in the base signature string (but not in
+           the HTTP header). */
         if( args )
                 oauth_params_parse( &params, args );
@@ -396 +423 @@
         }
         
+        /* Append the signature and we're done! */
         params_s = oauth_params_string( params );
         sig = oauth_sign( method, url, params_s, token_secret );

lib/oauth.h

@@ -25 +25 @@
 
 struct oauth_info;
-typedef void (*oauth_cb)( struct oauth_info * );
+
+/* Callback function called twice during the access token request process.
+   Return FALSE if something broke and the process must be aborted. */
+typedef gboolean (*oauth_cb)( struct oauth_info * );
 
 typedef enum
@@ -53 +56 @@
    authorization URL for the user. This is passed to the callback function
    in a struct oauth_info. */
-void *oauth_request_token( const char *url, oauth_cb func, void *data );
+struct oauth_info *oauth_request_token( const char *url, oauth_cb func, void *data );
 
 /* http://oauth.net/core/1.0a/#auth_step3 (section 6.3)
@@ -59 +62 @@
    token. This is passed to the callback function in the same
    struct oauth_info. */
-void *oauth_access_token( const char *url, const char *pin, struct oauth_info *st );
+void oauth_access_token( const char *url, const char *pin, struct oauth_info *st );
 
 /* http://oauth.net/core/1.0a/#anchor12 (section 7)
@@ -67 +70 @@
    automatically be grabbed from url. */
 char *oauth_http_header( char *access_token, const char *method, const char *url, char *args );
+
+/* Shouldn't normally be required unless the process is aborted by the user. */
+void oauth_info_free( struct oauth_info *info );

protocols/twitter/twitter.c

@@ -66 +66 @@
 }
 
-static void twitter_oauth_callback( struct oauth_info *info );
+static gboolean twitter_oauth_callback( struct oauth_info *info );
 
 static void twitter_oauth_start( struct im_connection *ic )
 {
+        struct twitter_data *td = ic->proto_data;
+        
         imcb_log( ic, "Requesting OAuth request token" );
 
-        oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
-}
-
-static void twitter_oauth_callback( struct oauth_info *info )
+        td->oauth_info = oauth_request_token(
+                TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+}
+
+static gboolean twitter_oauth_callback( struct oauth_info *info )
 {
         struct im_connection *ic = info->data;
-        struct twitter_data *td = ic->proto_data;
-        
+        struct twitter_data *td;
+        
+        if( !g_slist_find( twitter_connections, ic ) )
+                return FALSE;
+        
+        td = ic->proto_data;
         if( info->stage == OAUTH_REQUEST_TOKEN )
         {
@@ -88 +95 @@
                         imcb_error( ic, "OAuth error: %s", info->http->status_string );
                         imc_logout( ic, TRUE );
-                        return;
+                        return FALSE;
                 }
-                
-                td->oauth_info = info;
                 
                 sprintf( name, "twitter_%s", ic->acc->user );
@@ -106 +111 @@
                         imcb_error( ic, "OAuth error: %s", info->http->status_string );
                         imc_logout( ic, TRUE );
-                        return;
+                        return FALSE;
                 }
                 
@@ -118 +123 @@
                 twitter_main_loop_start( ic );
         }
+        
+        return TRUE;
 }
 
@@ -188 +195 @@
         if( td )
         {
+                oauth_info_free( td->oauth_info );
+                
                 g_free( td->pass );
                 g_free( td->oauth );
@@ -206 +215 @@
             g_strcasecmp(who + 8, ic->acc->user) == 0)
         {
-                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth == NULL )
+                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth_info )
+                {
                         oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
+                        td->oauth_info = NULL;
+                }
                 else
                         twitter_post_status(ic, message);