Changeset 508c340 for lib

Timestamp:

2010-04-26T00:42:37Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

acba168

Parents:

b2bc25c

Message:

Successfully posted a tweet!

Twitter's tricky. It returns vars (user_id, screen_name) in the access token
that, the way I read the spec, should be included in all subsequent queries.
However, stuff only started to work when I dropped those vars.

This code's definitely not pretty ATM. Need to clean up now that it actually
works.

Location:

lib

Files:

• oauth.c (modified) (7 diffs)
• oauth.h (modified) (1 diff)

lib/oauth.c

@@ -175 +175 @@
 }
 
-GSList *oauth_params_parse( char *in )
-{
-        GSList *ret = NULL;
+static void oauth_params_parse( GSList **params, char *in )
+{
         char *amp, *eq;
         
@@ -190 +189 @@
                         *amp = '\0';
                 
-                oauth_params_add( &ret, in, eq + 1 );
+                oauth_params_add( params, in, eq + 1 );
                 
                 *eq = '=';
@@ -199 +198 @@
                 in = amp + 1;
         }
-        
-        return ret;
 }
 
@@ -312 +309 @@
         if( req->status_code == 200 )
         {
-                GSList *params;
+                GSList *params = NULL;
                 
                 st->auth_params = g_strdup( req->reply_body );
-                params = oauth_params_parse( st->auth_params );
+                oauth_params_parse( &params, st->auth_params );
                 st->token = g_strdup( oauth_params_get( &params, "oauth_token" ) );
                 oauth_params_free( &params );
@@ -345 +342 @@
 }
 
-char *oauth_http_header( char *access_token, const char *method, const char *url )
-{
-        GSList *params, *l;
-        char *token_secret, *sig, *params_s;
+char *oauth_http_header( char *access_token, const char *method, const char *url, char *args )
+{
+        GSList *params = NULL, *l;
+        char *token_secret, *sig, *params_s, *s;
         GString *ret = NULL;
         
-        params = oauth_params_parse( access_token );
+        oauth_params_parse( &params, access_token );
         if( params == NULL )
                 goto err;
@@ -361 +358 @@
         oauth_add_default_params( &params );
         
+        ret = g_string_new( "OAuth " );
+        for( l = params; l; l = l->next )
+        {
+                char *kv = l->data;
+                char *eq = strchr( kv, '=' );
+                char esc[strlen(kv)*3+1];
+                
+                if( eq == NULL )
+                        break; /* WTF */
+                
+                strcpy( esc, eq + 1 );
+                http_encode( esc );
+                
+                g_string_append_len( ret, kv, eq - kv + 1 );
+                g_string_append_c( ret, '"' );
+                g_string_append( ret, esc );
+                g_string_append( ret, "\", " );
+        }
+        
+        if( args )
+                oauth_params_parse( &params, args );
+        if( ( s = strchr( url, '?' ) ) )
+        {
+                s = g_strdup( s + 1 );
+                oauth_params_parse( &params, s + 1 );
+                g_free( s );
+        }
+        
         params_s = oauth_params_string( params );
         sig = oauth_sign( method, url, params_s, token_secret );
@@ -367 +392 @@
         http_encode( sig );
         
-        ret = g_string_new( "OAuth " );
-        for( l = params; l; l = l->next )
-        {
-                char *kv = l->data;
-                char *eq = strchr( kv, '=' );
-                char esc[strlen(kv)*3+1];
-                
-                if( eq == NULL )
-                        break; /* WTF */
-                
-                strcpy( esc, eq + 1 );
-                http_encode( esc );
-                
-                g_string_append_len( ret, kv, eq - kv + 1 );
-                g_string_append_c( ret, '"' );
-                g_string_append( ret, esc );
-                g_string_append( ret, "\", " );
-        }
-        
         g_string_append_printf( ret, "oauth_signature=\"%s\"", sig );
         

lib/oauth.h

@@ -21 +21 @@
 *                                                                           *
 \***************************************************************************/
+
+char *oauth_http_header( char *access_token, const char *method, const char *url, char *args );