Changes in / [f1b7711:23784065]

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• lib/Makefile (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/oauth.c (added)
• lib/oauth.h (added)
• lib/url.c (modified) (1 diff)
• lib/url.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (6 diffs)
• protocols/twitter/twitter.h (modified) (2 diffs)
• protocols/twitter/twitter_http.c (modified) (3 diffs)
• protocols/twitter/twitter_http.h (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (5 diffs)

doc/user-guide/commands.xml

@@ -79 +79 @@
                                                 To send tweets yourself, send them to the twitter_(yourusername) contact, or just write in the groupchat channel if you enabled that option.
                                         </para>
+
+                                        <para>
+                                                Since Twitter now requires OAuth authentication, you should not enter your Twitter password into BitlBee. Just type a bogus password. The first time you log in, BitlBee will start OAuth authentication. (See <emphasis>help set oauth</emphasis>.)
+                                        </para>
                                 </description>
                         </bitlbee-command>
@@ -703 +707 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="oauth" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                This enables OAuth authentication for Twitter accounts. From June 2010 this will be mandatory.
+                        </para>
+
+                        <para>
+                                With OAuth enabled, you shouldn't tell BitlBee your Twitter password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with Twitter. If this succeeds, Twitter will return a PIN code which you can give back to BitlBee to finish the process.
+                        </para>
+
+                        <para>
+                                The resulting access token will be saved permanently, so you have to do this only once.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall

lib/misc.c

@@ -306 +306 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' ) */
-                if( !isalnum( t[i] ) )
+                if( !isalnum( t[i] ) && !strchr( "._-~", t[i] ) )
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );

lib/url.c

@@ -27 +27 @@
 
 /* Convert an URL to a url_t structure */
-int url_set( url_t *url, char *set_url )
+int url_set( url_t *url, const char *set_url )
 {
         char s[MAX_STRING+1];

lib/url.h

@@ -42 +42 @@
 } url_t;
 
-int url_set( url_t *url, char *set_url );
+int url_set( url_t *url, const char *set_url );

protocols/twitter/twitter.c

@@ -23 +23 @@
 
 #include "nogaim.h"
+#include "oauth.h"
 #include "twitter.h"
 #include "twitter_http.h"
@@ -49 +50 @@
         // If we are still logged in run this function again after timeout.
         return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
+}
+
+static void twitter_main_loop_start( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        imcb_log( ic, "Connecting to Twitter" );
+
+        // Run this once. After this queue the main loop function.
+        twitter_main_loop(ic, -1, 0);
+
+        // Queue the main_loop
+        // Save the return value, so we can remove the timeout on logout.
+        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+}
+
+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" );
+
+        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;
+        
+        if( !g_slist_find( twitter_connections, ic ) )
+                return FALSE;
+        
+        td = ic->proto_data;
+        if( info->stage == OAUTH_REQUEST_TOKEN )
+        {
+                char name[strlen(ic->acc->user)+9], *msg;
+                
+                if( info->request_token == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return FALSE;
+                }
+                
+                sprintf( name, "twitter_%s", ic->acc->user );
+                msg = g_strdup_printf( "To finish OAuth authentication, please visit "
+                                       "%s?%s and respond with the resulting PIN code.",
+                                       TWITTER_OAUTH_AUTHORIZE, info->auth_params );
+                imcb_buddy_msg( ic, name, msg, 0, 0 );
+                g_free( msg );
+        }
+        else if( info->stage == OAUTH_ACCESS_TOKEN )
+        {
+                if( info->access_token == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return FALSE;
+                }
+                
+                td->oauth = g_strdup( info->access_token );
+                
+                /* IM mods didn't do this so far and it's ugly but I should
+                   be able to get away with it... */
+                g_free( ic->acc->pass );
+                ic->acc->pass = g_strdup( info->access_token );
+                
+                twitter_main_loop_start( ic );
+        }
+        
+        return TRUE;
 }
 
@@ -67 +143 @@
         s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "oauth", "true", set_eval_bool, acc );
 }
 
@@ -80 +158 @@
 
         twitter_connections = g_slist_append( twitter_connections, ic );
-
+        ic->proto_data = td;
+        
         td->user = acc->user;
-        td->pass = acc->pass;
+        if( !set_getbool( &acc->set, "oauth" ) )
+                td->pass = g_strdup( acc->pass );
+        else if( strstr( acc->pass, "oauth_token=" ) )
+                td->oauth = g_strdup( acc->pass );
         td->home_timeline_id = 0;
-
-        ic->proto_data = td;
-
-        imcb_log( ic, "Connecting to Twitter" );
-
-        // Run this once. After this queue the main loop function.
-        twitter_main_loop(ic, -1, 0);
-
-        // Queue the main_loop
-        // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
         
         sprintf( name, "twitter_%s", acc->user );
         imcb_add_buddy( ic, name, NULL );
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
+        
+        if( td->pass || td->oauth )
+                twitter_main_loop_start( ic );
+        else
+                twitter_oauth_start( ic );
 }
 
@@ -119 +195 @@
         if( td )
         {
+                oauth_info_free( td->oauth_info );
+                
+                g_free( td->pass );
+                g_free( td->oauth );
                 g_free( td );
         }
@@ -130 +210 @@
 static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
+        struct twitter_data *td = ic->proto_data;
+        
         if (g_strncasecmp(who, "twitter_", 8) == 0 &&
             g_strcasecmp(who + 8, ic->acc->user) == 0)
-                twitter_post_status(ic, message);
+        {
+                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);
+        }
         else
+        {
                 twitter_direct_messages_new(ic, who, message);
-        
+        }
         return( 0 );
 }

protocols/twitter/twitter.h

@@ -37 +37 @@
         char* user;
         char* pass;
+        char* oauth;
+        struct oauth_info *oauth_info;
         guint64 home_timeline_id;
         gint main_loop_id;
@@ -50 +52 @@
 GSList *twitter_connections;
 
+#define TWITTER_OAUTH_REQUEST_TOKEN "http://api.twitter.com/oauth/request_token"
+#define TWITTER_OAUTH_ACCESS_TOKEN  "http://api.twitter.com/oauth/access_token"
+#define TWITTER_OAUTH_AUTHORIZE     "http://api.twitter.com/oauth/authorize"
+
 #endif //_TWITTER_H

protocols/twitter/twitter_http.c

@@ -35 +35 @@
 #include "misc.h"
 #include "base64.h"
+#include "oauth.h"
 #include <ctype.h>
 #include <errno.h>
@@ -45 +46 @@
  * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
  */
-void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char** arguments, int arguments_len)
+void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char* oauth_token, char** arguments, int arguments_len)
 {
         url_t *url = g_new0( url_t, 1 );
@@ -110 +111 @@
 
         // If a pass and user are given we append them to the request.
-        if (userpass_base64)
+        if (oauth_token)
+        {
+                char *full_header;
+                
+                full_header = oauth_http_header(oauth_token,
+                                                is_post ? "POST" : "GET",
+                                                url_string, url_arguments);
+                
+                tmp = g_strdup_printf("%sAuthorization: %s\r\n", request, full_header);
+                g_free(request);
+                g_free(full_header);
+                request = tmp;
+        }
+        else if (userpass_base64)
         {
                 tmp = g_strdup_printf("%sAuthorization: Basic %s\r\n", request, userpass_base64);

protocols/twitter/twitter_http.h

@@ -29 +29 @@
 
 void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, 
-                                        char* user, char* pass, char** arguments, int arguments_len);
+                   char* user, char* pass, char *oauth_token, char** arguments, int arguments_len);
 
 #endif //_TWITTER_HTTP_H

protocols/twitter/twitter_lib.c

@@ -130 +130 @@
         args[0] = "cursor";
         args[1] = g_strdup_printf ("%d", next_cursor);
-        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, td->oauth, args, 2);
 
         g_free(args[1]);
@@ -396 +396 @@
         }
 
-        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, args, td->home_timeline_id ? 4 : 2);
+        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, td->oauth, args, td->home_timeline_id ? 4 : 2);
 
         g_free(args[1]);
@@ -620 +620 @@
         args[1] = g_strdup_printf ("%d", next_cursor);
 
-        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, td->oauth, args, 2);
 
         g_free(args[1]);
@@ -654 +654 @@
         args[0] = "status";
         args[1] = msg;
-        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 2);
 //      g_free(args[1]);
 }
@@ -672 +672 @@
         args[3] = msg;
         // Use the same callback as for twitter_post_status, since it does basically the same.
-        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 4);
+        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 4);
 //      g_free(args[1]);
 //      g_free(args[3]);