Changeset ce617f0

Timestamp:

2011-03-27T14:09:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f01bc6f

Parents:

ff94563

Message:

Tweaks to allow authenticating to identi.ca with OAuth. Doesn't seem to work
completely for whatever the reason may be (invalid signature). I give up for
now. Stuff does actually work if you generate access tokens using different
software so BitlBee's definitely able to generate good signatures.

Files:

• lib/oauth.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (3 diffs)

lib/oauth.c

@@ -108 +108 @@
 static char *oauth_nonce()
 {
-        unsigned char bytes[9];
+        unsigned char bytes[21];
+        char *ret = g_new0( char, sizeof( bytes) / 3 * 4 + 1 );
         
         random_bytes( bytes, sizeof( bytes ) );
-        return base64_encode( bytes, sizeof( bytes ) );
+        base64_encode_real( bytes, sizeof( bytes), (unsigned char*) ret, "0123456789"
+                            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0A" );
+        
+        return ret;
 }
 

protocols/twitter/twitter.c

@@ -99 +99 @@
 };
 
+static const struct oauth_service identica_oauth =
+{
+        "http://identi.ca/api/oauth/request_token",
+        "http://identi.ca/api/oauth/access_token",
+        "https://identi.ca/api/oauth/authorize",
+        .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da",
+        .consumer_secret = "c596267f277457ec0ce1ab7bb788d828",
+};
+
 static gboolean twitter_oauth_callback( struct oauth_info *info );
 
+static const struct oauth_service *get_oauth_service( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        if( strstr( td->url_host, "identi.ca" ) )
+                return &identica_oauth;
+        else
+                return &twitter_oauth;
+        
+        /* Could add more services, or allow configuring your own base URL +
+           API keys. */
+}
+
 static void twitter_oauth_start( struct im_connection *ic )
 {
@@ -107 +129 @@
         imcb_log( ic, "Requesting OAuth request token" );
 
-        td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
+        td->oauth_info = oauth_request_token( get_oauth_service( ic ), twitter_oauth_callback, ic );
         
         /* We need help from the user to complete OAuth login, so don't time
@@ -263 +285 @@
         td->user = acc->user;
         if( strstr( acc->pass, "oauth_token=" ) )
-                td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
+                td->oauth_info = oauth_from_string( acc->pass, get_oauth_service( ic ) );
         
         sprintf( name, "%s_%s", td->prefix, acc->user );