Changeset 3b878a1 for protocols


Ignore:
Timestamp:
2010-05-02T21:20:09Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
6824fb3
Parents:
839189b (diff), f4b0911 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

OAuth sanity fix: Twitter-specific stuff should *not* be in lib/oauth.c.
Somewhat intrusive, should've done this right immediately. :-/

Location:
protocols/twitter
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • protocols/twitter/twitter.c

    r839189b r3b878a1  
    2828#include "twitter_lib.h"
    2929
    30 
    3130/**
    3231 * Main loop function
     
    6665}
    6766
     67
     68static const struct oauth_service twitter_oauth =
     69{
     70        "http://api.twitter.com/oauth/request_token",
     71        "http://api.twitter.com/oauth/access_token",
     72        "http://api.twitter.com/oauth/authorize",
     73        .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
     74        .consumer_secret = "FCxqcr0pXKzsF9ajmP57S3VQ8V6Drk4o2QYtqMcOszo",
     75};
     76
    6877static gboolean twitter_oauth_callback( struct oauth_info *info );
    6978
     
    7483        imcb_log( ic, "Requesting OAuth request token" );
    7584
    76         td->oauth_info = oauth_request_token(
    77                 TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
     85        td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
    7886}
    7987
     
    100108                sprintf( name, "twitter_%s", ic->acc->user );
    101109                msg = g_strdup_printf( "To finish OAuth authentication, please visit "
    102                                        "%s?%s and respond with the resulting PIN code.",
    103                                        TWITTER_OAUTH_AUTHORIZE, info->auth_params );
     110                                       "%s and respond with the resulting PIN code.",
     111                                       info->auth_url );
    104112                imcb_buddy_msg( ic, name, msg, 0, 0 );
    105113                g_free( msg );
     
    107115        else if( info->stage == OAUTH_ACCESS_TOKEN )
    108116        {
    109                 if( info->access_token == NULL )
     117                if( info->token == NULL || info->token_secret == NULL )
    110118                {
    111119                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
     
    114122                }
    115123               
    116                 td->oauth = g_strdup( info->access_token );
    117                
    118124                /* IM mods didn't do this so far and it's ugly but I should
    119125                   be able to get away with it... */
    120126                g_free( ic->acc->pass );
    121                 ic->acc->pass = g_strdup( info->access_token );
     127                ic->acc->pass = oauth_to_string( info );
    122128               
    123129                twitter_main_loop_start( ic );
     
    126132        return TRUE;
    127133}
     134
    128135
    129136static char *set_eval_mode( set_t *set, char *value )
     
    165172                td->pass = g_strdup( acc->pass );
    166173        else if( strstr( acc->pass, "oauth_token=" ) )
    167                 td->oauth = g_strdup( acc->pass );
     174                td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
    168175        td->home_timeline_id = 0;
    169176       
     
    172179        imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
    173180       
    174         if( td->pass || td->oauth )
     181        if( td->pass || td->oauth_info )
    175182                twitter_main_loop_start( ic );
    176183        else
     
    197204        {
    198205                oauth_info_free( td->oauth_info );
    199                
    200206                g_free( td->pass );
    201                 g_free( td->oauth );
    202207                g_free( td );
    203208        }
     
    216221            g_strcasecmp(who + 8, ic->acc->user) == 0)
    217222        {
    218                 if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth_info )
     223                if( set_getbool( &ic->acc->set, "oauth" ) &&
     224                    td->oauth_info && td->oauth_info->token == NULL )
    219225                {
    220                         oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
    221                         td->oauth_info = NULL;
     226                        if( !oauth_access_token( message, td->oauth_info ) )
     227                        {
     228                                imcb_error( ic, "OAuth error: %s", "Failed to send access token request" );
     229                                imc_logout( ic, TRUE );
     230                                return FALSE;
     231                        }
    222232                }
    223233                else
  • protocols/twitter/twitter.h

    r839189b r3b878a1  
    3737        char* user;
    3838        char* pass;
    39         char* oauth;
    4039        struct oauth_info *oauth_info;
    4140        guint64 home_timeline_id;
     
    5251GSList *twitter_connections;
    5352
    54 #define TWITTER_OAUTH_REQUEST_TOKEN "http://api.twitter.com/oauth/request_token"
    55 #define TWITTER_OAUTH_ACCESS_TOKEN  "http://api.twitter.com/oauth/access_token"
    56 #define TWITTER_OAUTH_AUTHORIZE     "http://api.twitter.com/oauth/authorize"
    57 
    5853#endif //_TWITTER_H
  • protocols/twitter/twitter_http.c

    r839189b r3b878a1  
    2929****************************************************************************/
    3030
    31 #include "twitter_http.h"
    3231#include "twitter.h"
    3332#include "bitlbee.h"
     
    3938#include <errno.h>
    4039
     40#include "twitter_http.h"
     41
    4142
    4243char *twitter_url_append(char *url, char *key, char* value);
     
    4647 * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
    4748 */
    48 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)
     49void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, struct oauth_info* oi, char** arguments, int arguments_len)
    4950{
    5051        url_t *url = g_new0( url_t, 1 );
     
    111112
    112113        // If a pass and user are given we append them to the request.
    113         if (oauth_token)
     114        if (oi)
    114115        {
    115116                char *full_header;
    116117               
    117                 full_header = oauth_http_header(oauth_token,
    118                                                 is_post ? "POST" : "GET",
     118                full_header = oauth_http_header(oi, is_post ? "POST" : "GET",
    119119                                                url_string, url_arguments);
    120120               
  • protocols/twitter/twitter_http.h

    r839189b r3b878a1  
    2828#include "http_client.h"
    2929
     30struct oauth_info;
     31
    3032void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post,
    31                    char* user, char* pass, char *oauth_token, char** arguments, int arguments_len);
     33                   char* user, char* pass, struct oauth_info *oi, char** arguments, int arguments_len);
    3234
    3335#endif //_TWITTER_HTTP_H
  • protocols/twitter/twitter_lib.c

    r839189b r3b878a1  
    130130        args[0] = "cursor";
    131131        args[1] = g_strdup_printf ("%d", next_cursor);
    132         twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, td->oauth, args, 2);
     132        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, td->oauth_info, args, 2);
    133133
    134134        g_free(args[1]);
     
    396396        }
    397397
    398         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);
     398        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, td->oauth_info, args, td->home_timeline_id ? 4 : 2);
    399399
    400400        g_free(args[1]);
     
    510510        {
    511511                td->http_fails = 0;
    512                 if (!ic->flags & OPT_LOGGED_IN)
     512                if (!(ic->flags & OPT_LOGGED_IN))
    513513                        imcb_connected(ic);
    514514        }
     
    620620        args[1] = g_strdup_printf ("%d", next_cursor);
    621621
    622         twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, td->oauth, args, 2);
     622        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, td->oauth_info, args, 2);
    623623
    624624        g_free(args[1]);
     
    654654        args[0] = "status";
    655655        args[1] = msg;
    656         twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 2);
     656        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth_info, args, 2);
    657657//      g_free(args[1]);
    658658}
     
    672672        args[3] = msg;
    673673        // Use the same callback as for twitter_post_status, since it does basically the same.
    674         twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 4);
     674        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth_info, args, 4);
    675675//      g_free(args[1]);
    676676//      g_free(args[3]);
Note: See TracChangeset for help on using the changeset viewer.