Changes in lib/oauth2.c [ba654ec:3bda2c2]

File:

• lib/oauth2.c (modified) (6 diffs)

lib/oauth2.c

@@ -4 +4 @@
 *  Simple OAuth client (consumer) implementation.                           *
 *                                                                           *
-*  Copyright 2010-2012 Wilmer van der Gaast <wilmer@gaast.net>              *
+*  Copyright 2010-2011 Wilmer van der Gaast <wilmer@gaast.net>              *
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -26 +26 @@
 #include "oauth2.h"
 #include "oauth.h"
-#include "json.h"
 #include "url.h"
 
@@ -45 +44 @@
 };
 
+static char *oauth2_json_dumb_get( const char *json, const char *key );
 static void oauth2_access_token_done( struct http_request *req );
 
@@ -103 +103 @@
         struct oauth2_access_token_data *cb_data = req->data;
         char *atoken = NULL, *rtoken = NULL;
-        const char *content_type;
+        char *content_type;
         
         if( getenv( "BITLBEE_DEBUG" ) && req->reply_body )
@@ -115 +115 @@
         else if( content_type && strstr( content_type, "application/json" ) )
         {
-                json_value *js = json_parse( req->reply_body );
-                if( js && js->type == json_object )
-                {
-                        int i;
-                        
-                        for( i = 0; i < js->u.object.length; i ++ )
-                        {
-                                if( js->u.object.values[i].value->type != json_string )
-                                        continue;
-                                if( strcmp( js->u.object.values[i].name, "access_token" ) == 0 )
-                                        atoken = g_strdup( js->u.object.values[i].value->u.string.ptr );
-                                if( strcmp( js->u.object.values[i].name, "refresh_token" ) == 0 )
-                                        rtoken = g_strdup( js->u.object.values[i].value->u.string.ptr );
-                        }
-                }
-                json_value_free( js );
+                atoken = oauth2_json_dumb_get( req->reply_body, "access_token" );
+                rtoken = oauth2_json_dumb_get( req->reply_body, "refresh_token" );
         }
         else
@@ -146 +132 @@
         
         cb_data->func( cb_data->data, atoken, rtoken );
+        g_free( content_type );
         g_free( atoken );
         g_free( rtoken );
         g_free( cb_data );
 }
+
+/* Super dumb. I absolutely refuse to use/add a complete json parser library
+   (adding a new dependency to BitlBee for the first time in.. 6 years?) just
+   to parse 100 bytes of data. So I have to do my own parsing because OAuth2
+   dropped support for XML. (GRRR!) This is very dumb and for example won't
+   work for integer values, nor will it strip/handle backslashes. */
+static char *oauth2_json_dumb_get( const char *json, const char *key )
+{
+        int is_key = 0; /* 1 == reading key, 0 == reading value */
+        int found_key = 0;
+                
+        while( json && *json )
+        {
+                /* Grab strings and see if they're what we're looking for. */
+                if( *json == '"' || *json == '\'' )
+                {
+                        char q = *json;
+                        const char *str_start;
+                        json ++;
+                        str_start = json;
+                        
+                        while( *json )
+                        {
+                                /* \' and \" are not string terminators. */
+                                if( *json == '\\' && json[1] == q )
+                                        json ++;
+                                /* But without a \ it is. */
+                                else if( *json == q )
+                                        break;
+                                json ++;
+                        }
+                        if( *json == '\0' )
+                                return NULL;
+                        
+                        if( is_key && strncmp( str_start, key, strlen( key ) ) == 0 )
+                        {
+                                found_key = 1;
+                        }
+                        else if( !is_key && found_key )
+                        {
+                                char *ret = g_memdup( str_start, json - str_start + 1 );
+                                ret[json-str_start] = '\0';
+                                return ret;
+                        }
+                        
+                }
+                else if( *json == '{' || *json == ',' )
+                {
+                        found_key = 0;
+                        is_key = 1;
+                }
+                else if( *json == ':' )
+                        is_key = 0;
+                
+                json ++;
+        }
+        
+        return NULL;
+}