]> ToastFreeware Gitweb - gregoa/bti.git/blobdiff - bti.c
long line cleanups
[gregoa/bti.git] / bti.c
diff --git a/bti.c b/bti.c
index 10ea6ffde82e563b0f2f5a83615141ad83f762e0..588de2fc50d1a51bf91a7e2218b4f5a9898bbaac 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -39,6 +39,7 @@
 #include <pcre.h>
 #include <termios.h>
 #include <dlfcn.h>
+#include <oauth.h>
 
 
 #define zalloc(size)   calloc(size, 1)
@@ -73,6 +74,10 @@ enum action {
 struct session {
        char *password;
        char *account;
+       char *consumer_key;
+       char *consumer_secret;
+       char *access_token_key;
+       char *access_token_secret;
        char *tweet;
        char *proxy;
        char *time;
@@ -89,6 +94,7 @@ struct session {
        int shrink_urls;
        int dry_run;
        int page;
+       int no_oauth;
        enum host host;
        enum action action;
        void *readline_handle;
@@ -248,6 +254,10 @@ static void session_free(struct session *session)
        free(session->replyto);
        free(session->password);
        free(session->account);
+       free(session->consumer_key);
+       free(session->consumer_secret);
+       free(session->access_token_key);
+       free(session->access_token_secret);
        free(session->tweet);
        free(session->proxy);
        free(session->time);
@@ -288,17 +298,25 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
        free(buffer);
 }
 
-static const char *twitter_host  = "https://twitter.com/statuses";
+static const char *twitter_host  = "http://api.twitter.com/1/statuses";
 static const char *identica_host = "https://identi.ca/api/statuses";
 static const char *twitter_name  = "twitter";
 static const char *identica_name = "identi.ca";
 
-static const char *user_uri    = "/user_timeline/";
-static const char *update_uri  = "/update.xml";
-static const char *public_uri  = "/public_timeline.xml";
-static const char *friends_uri = "/friends_timeline.xml";
-static const char *replies_uri = "/replies.xml";
-static const char *group_uri = "/../laconica/groups/timeline/";
+static const char *twitter_request_token_uri  = "http://twitter.com/oauth/request_token";
+static const char *twitter_access_token_uri   = "http://twitter.com/oauth/access_token";
+static const char *twitter_authorize_uri      = "http://twitter.com/oauth/authorize?oauth_token=";
+static const char *identica_request_token_uri = "http://identi.ca/api/oauth/request_token";
+static const char *identica_access_token_uri  = "http://identi.ca/api/oauth/access_token";
+static const char *identica_authorize_uri     = "http://identi.ca/api/oauth/authorize?oauth_token=";
+
+static const char *user_uri     = "/user_timeline/";
+static const char *update_uri   = "/update.xml";
+static const char *public_uri   = "/public_timeline.xml";
+static const char *friends_uri  = "/friends_timeline.xml";
+static const char *mentions_uri = "/mentions.xml";
+static const char *replies_uri  = "/replies.xml";
+static const char *group_uri    = "/../statusnet/groups/timeline/";
 
 static CURL *curl_init(void)
 {
@@ -429,9 +447,122 @@ static size_t curl_callback(void *buffer, size_t size, size_t nmemb,
        return buffer_size;
 }
 
+static int parse_osp_reply(const char *reply, char **token, char **secret)
+{
+       int rc;
+       int retval = 1;
+       char **rv = NULL;
+       rc = oauth_split_url_parameters(reply, &rv);
+       qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
+       if (rc == 2 || rc == 4) {
+               if (!strncmp(rv[0], "oauth_token=", 11) &&
+                   !strncmp(rv[1], "oauth_token_secret=", 18)) {
+                       if (token)
+                               *token = strdup(&(rv[0][12]));
+                       if (secret)
+                               *secret = strdup(&(rv[1][19]));
+
+                       retval = 0;
+               }
+       } else if (rc == 3) {
+               if (!strncmp(rv[1], "oauth_token=", 11) &&
+                   !strncmp(rv[2], "oauth_token_secret=", 18)) {
+                       if (token)
+                               *token = strdup(&(rv[1][12]));
+                       if (secret)
+                               *secret = strdup(&(rv[2][19]));
+
+                       retval = 0;
+               }
+       }
+
+       dbg("token: %s\n", *token);
+       dbg("secret: %s\n", *secret);
+
+       if (rv)
+               free(rv);
+
+       return retval;
+}
+
+static int request_access_token(struct session *session)
+{
+       char *post_params = NULL;
+       char *request_url = NULL;
+       char *reply    = NULL;
+       char *at_key      = NULL;
+       char *at_secret   = NULL;
+       char *verifier    = NULL;
+       char at_uri[90];
+
+       if (!session)
+               return -EINVAL;
+
+       if (session->host == HOST_TWITTER)
+               request_url = oauth_sign_url2(
+                               twitter_request_token_uri, NULL,
+                               OA_HMAC, NULL, session->consumer_key,
+                               session->consumer_secret, NULL, NULL);
+       else if (session->host == HOST_IDENTICA)
+               request_url = oauth_sign_url2(
+                               identica_request_token_uri, NULL,
+                               OA_HMAC, NULL, session->consumer_key,
+                               session->consumer_secret, NULL, NULL);
+       reply = oauth_http_get(request_url, post_params);
+
+       if (request_url)
+               free(request_url);
+
+       if (post_params)
+               free(post_params);
+
+       if (!reply)
+               return 1;
+
+       if (parse_osp_reply(reply, &at_key, &at_secret))
+               return 1;
+
+       free(reply);
+
+       fprintf(stdout, "Please open the following link in your browser, and ");
+       fprintf(stdout, "allow 'bti' to access your account. Then paste ");
+       fprintf(stdout, "back the provided PIN in here.\n");
+       if (session->host == HOST_TWITTER) {
+               fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
+               verifier = session->readline(NULL);
+               sprintf(at_uri, "%s?oauth_verifier=%s",
+                       twitter_access_token_uri, verifier);
+       } else if (session->host == HOST_IDENTICA) {
+               fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
+               verifier = session->readline(NULL);
+               sprintf(at_uri, "%s?oauth_verifier=%s",
+                       identica_access_token_uri, verifier);
+       }
+       request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,
+                                     session->consumer_key,
+                                     session->consumer_secret,
+                                     at_key, at_secret);
+       reply = oauth_http_get(request_url, post_params);
+
+       if (!reply)
+               return 1;
+
+       if (parse_osp_reply(reply, &at_key, &at_secret))
+               return 1;
+
+       free(reply);
+
+       fprintf(stdout, "Please put these two lines in your bti ");
+       fprintf(stdout, "configuration file (~/.bti):\n");
+       fprintf(stdout, "access_token_key=%s\n", at_key);
+       fprintf(stdout, "access_token_secret=%s\n", at_secret);
+
+       return 0;
+}
+
 static int send_request(struct session *session)
 {
-       char endpoint[100];
+       char endpoint[500];
        char user_password[500];
        char data[500];
        struct bti_curl_buffer *curl_buf;
@@ -440,116 +571,185 @@ static int send_request(struct session *session)
        struct curl_httppost *formpost = NULL;
        struct curl_httppost *lastptr = NULL;
        struct curl_slist *slist = NULL;
+       char *req_url = NULL;
+       char *reply = NULL;
+       char *postarg = NULL;
+       char *escaped_tweet = NULL;
+       int is_post = 0;
 
        if (!session)
                return -EINVAL;
 
-       curl_buf = bti_curl_buffer_alloc(session->action);
-       if (!curl_buf)
-               return -ENOMEM;
-
-       curl = curl_init();
-       if (!curl)
-               return -EINVAL;
-
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 
-       switch (session->action) {
-       case ACTION_UPDATE:
-               snprintf(user_password, sizeof(user_password), "%s:%s",
-                        session->account, session->password);
-               snprintf(data, sizeof(data), "status=\"%s\"", session->tweet);
-               curl_formadd(&formpost, &lastptr,
-                            CURLFORM_COPYNAME, "status",
-                            CURLFORM_COPYCONTENTS, session->tweet,
-                            CURLFORM_END);
-
-               curl_formadd(&formpost, &lastptr,
-                            CURLFORM_COPYNAME, "source",
-                            CURLFORM_COPYCONTENTS, "bti",
-                            CURLFORM_END);
-
-               if (session->replyto)
+       if (session->no_oauth) {
+               curl_buf = bti_curl_buffer_alloc(session->action);
+               if (!curl_buf)
+                       return -ENOMEM;
+
+               curl = curl_init();
+               if (!curl)
+                       return -EINVAL;
+
+               if (!session->hosturl)
+                       session->hosturl = strdup(twitter_host);
+
+               switch (session->action) {
+               case ACTION_UPDATE:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       snprintf(data, sizeof(data), "status=\"%s\"",
+                                session->tweet);
                        curl_formadd(&formpost, &lastptr,
-                                    CURLFORM_COPYNAME, "in_reply_to_status_id",
-                                    CURLFORM_COPYCONTENTS, session->replyto,
+                                    CURLFORM_COPYNAME, "status",
+                                    CURLFORM_COPYCONTENTS, session->tweet,
                                     CURLFORM_END);
 
-               curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
-               slist = curl_slist_append(slist, "Expect:");
-               curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+                       curl_formadd(&formpost, &lastptr,
+                                    CURLFORM_COPYNAME, "source",
+                                    CURLFORM_COPYCONTENTS, "bti",
+                                    CURLFORM_END);
 
-               sprintf(endpoint, "%s%s", session->hosturl, update_uri);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-               curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       if (session->replyto)
+                               curl_formadd(&formpost, &lastptr,
+                                            CURLFORM_COPYNAME, "in_reply_to_status_id",
+                                            CURLFORM_COPYCONTENTS, session->replyto,
+                                            CURLFORM_END);
 
-               break;
-       case ACTION_FRIENDS:
-               snprintf(user_password, sizeof(user_password), "%s:%s",
-                        session->account, session->password);
-               sprintf(endpoint, "%s%s?page=%d", session->hosturl,
-                       friends_uri, session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-               curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
+                       slist = curl_slist_append(slist, "Expect:");
+                       curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
 
-               break;
-       case ACTION_USER:
-               sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
-                       user_uri, session->user, session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       sprintf(endpoint, "%s%s", session->hosturl, update_uri);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;
 
-               break;
-       case ACTION_REPLIES:
-               snprintf(user_password, sizeof(user_password), "%s:%s",
-                        session->account, session->password);
-               sprintf(endpoint, "%s%s?page=%d", session->hosturl, replies_uri,
-                       session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-               curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+               case ACTION_FRIENDS:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                                       friends_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;
 
-               break;
-       case ACTION_PUBLIC:
-               sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri,
-                       session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+               case ACTION_USER:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
+                               user_uri, session->user, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
 
-               break;
-       case ACTION_GROUP:
-               sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
-                               group_uri, session->group, session->page);
-               curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+               case ACTION_REPLIES:
+                       snprintf(user_password, sizeof(user_password), "%s:%s",
+                                session->account, session->password);
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               replies_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+                       break;
 
-               break;
-       default:
-               break;
-       }
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
 
-       if (session->proxy)
-               curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+               case ACTION_GROUP:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, group_uri, session->group,
+                               session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       break;
 
-       if (debug)
-               curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-
-       dbg("user_password = %s\n", user_password);
-       dbg("data = %s\n", data);
-       dbg("proxy = %s\n", session->proxy);
-
-       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
-       curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
-       if (!session->dry_run) {
-               res = curl_easy_perform(curl);
-               if (res && !session->bash) {
-                       fprintf(stderr, "error(%d) trying to perform "
-                               "operation\n", res);
-                       return -EINVAL;
+               default:
+                       break;
                }
-       }
 
-       curl_easy_cleanup(curl);
-       if (session->action == ACTION_UPDATE)
-               curl_formfree(formpost);
-       bti_curl_buffer_free(curl_buf);
+               if (session->proxy)
+                       curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+
+               if (debug)
+                       curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+               dbg("user_password = %s\n", user_password);
+               dbg("data = %s\n", data);
+               dbg("proxy = %s\n", session->proxy);
+
+               curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
+               curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
+               if (!session->dry_run) {
+                       res = curl_easy_perform(curl);
+                       if (res && !session->bash) {
+                               fprintf(stderr, "error(%d) trying to perform "
+                                               "operation\n", res);
+                               return -EINVAL;
+                       }
+               }
+
+               curl_easy_cleanup(curl);
+               if (session->action == ACTION_UPDATE)
+                       curl_formfree(formpost);
+               bti_curl_buffer_free(curl_buf);
+       } else {
+               switch (session->action) {
+               case ACTION_UPDATE:
+                       escaped_tweet = oauth_url_escape(session->tweet);
+                       sprintf(endpoint, "%s%s?status=%s", session->hosturl,
+                               update_uri, escaped_tweet);
+                       is_post = 1;
+                       break;
+               case ACTION_USER:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, user_uri, session->user,
+                               session->page);
+                       break;
+               case ACTION_REPLIES:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               mentions_uri, session->page);
+                       break;
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       break;
+               case ACTION_GROUP:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, group_uri, session->group,
+                               session->page);
+                       break;
+               case ACTION_FRIENDS:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               friends_uri, session->page);
+                       break;
+               default:
+                       break;
+               }
+
+               if (is_post) {
+                       req_url = oauth_sign_url2(endpoint, &postarg, OA_HMAC,
+                                                 NULL, session->consumer_key,
+                                                 session->consumer_secret,
+                                                 session->access_token_key,
+                                                 session->access_token_secret);
+                       reply = oauth_http_post(req_url, postarg);
+               } else {
+                       req_url = oauth_sign_url2(endpoint, NULL, OA_HMAC, NULL,
+                                                 session->consumer_key,
+                                                 session->consumer_secret,
+                                                 session->access_token_key,
+                                                 session->access_token_secret);
+                       reply = oauth_http_get(req_url, postarg);
+               }
+
+               dbg("%s\n", req_url);
+               dbg("%s\n", reply);
+               if (req_url)
+                       free(req_url);
+
+               if (session->action != ACTION_UPDATE)
+                       parse_timeline(reply);
+       }
        return 0;
 }
 
@@ -560,6 +760,10 @@ static void parse_configfile(struct session *session)
        size_t len = 0;
        char *account = NULL;
        char *password = NULL;
+       char *consumer_key = NULL;
+       char *consumer_secret = NULL;
+       char *access_token_key = NULL;
+       char *access_token_secret = NULL;
        char *host = NULL;
        char *proxy = NULL;
        char *logfile = NULL;
@@ -602,6 +806,26 @@ static void parse_configfile(struct session *session)
                        c += 9;
                        if (c[0] != '\0')
                                password = strdup(c);
+               } else if (!strncasecmp(c, "consumer_key", 12) &&
+                          (c[12] == '=')) {
+                       c += 13;
+                       if (c[0] != '\0')
+                               consumer_key = strdup(c);
+               } else if (!strncasecmp(c, "consumer_secret", 15) &&
+                          (c[15] == '=')) {
+                       c += 16;
+                       if (c[0] != '\0')
+                               consumer_secret = strdup(c);
+               } else if (!strncasecmp(c, "access_token_key", 16) &&
+                          (c[16] == '=')) {
+                       c += 17;
+                       if (c[0] != '\0')
+                               access_token_key = strdup(c);
+               } else if (!strncasecmp(c, "access_token_secret", 19) &&
+                          (c[19] == '=')) {
+                       c += 20;
+                       if (c[0] != '\0')
+                               access_token_secret = strdup(c);
                } else if (!strncasecmp(c, "host", 4) &&
                           (c[4] == '=')) {
                        c += 5;
@@ -651,6 +875,14 @@ static void parse_configfile(struct session *session)
                session->password = password;
        if (account)
                session->account = account;
+       if (consumer_key)
+               session->consumer_key = consumer_key;
+       if (consumer_secret)
+               session->consumer_secret = consumer_secret;
+       if (access_token_key)
+               session->access_token_key = access_token_key;
+       if (access_token_secret)
+               session->access_token_secret = access_token_secret;
        if (host) {
                if (strcasecmp(host, "twitter") == 0) {
                        session->host = HOST_TWITTER;
@@ -1116,8 +1348,6 @@ int main(int argc, char *argv[], char *envp[])
        session->configfile = zalloc(strlen(session->homedir) + 7);
        sprintf(session->configfile, "%s/.bti", session->homedir);
 
-       curl_global_init(CURL_GLOBAL_ALL);
-
        /* Set environment variables first, before reading command line options
         * or config file values. */
        http_proxy = getenv("http_proxy");
@@ -1131,7 +1361,8 @@ int main(int argc, char *argv[], char *envp[])
        parse_configfile(session);
 
        while (1) {
-               option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:sr:nVv",
+               option = getopt_long_only(argc, argv,
+                                         "dp:P:H:a:A:u:c:hg:G:sr:nVv",
                                          options, NULL);
                if (option == -1)
                        break;
@@ -1238,8 +1469,9 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("configfile = %s\n", session->configfile);
 
                        /*
-                        * read the config file now.  Yes, this could override previously
-                        * set options from the command line, but the user asked for it...
+                        * read the config file now.  Yes, this could override
+                        * previously set options from the command line, but
+                        * the user asked for it...
                         */
                        parse_configfile(session);
                        break;
@@ -1266,6 +1498,41 @@ int main(int argc, char *argv[], char *envp[])
        if (debug)
                display_version();
 
+       if (session->host == HOST_TWITTER) {
+               if (!session->consumer_key || !session->consumer_secret) {
+                       fprintf(stderr, "Twitter no longer supuports HTTP basic authentication.\n");
+                       fprintf(stderr, "Both consumer key, and consumer secret are required");
+                       fprintf(stderr, " for bti in order to behave as an OAuth consumer.\n");
+                       goto exit;
+               }
+               if (session->action == ACTION_GROUP) {
+                       fprintf(stderr, "Groups only work in Identi.ca.\n");
+                       goto exit;
+               }
+       } else {
+               if (!session->consumer_key || !session->consumer_secret)
+                       session->no_oauth = 1;
+       }
+
+       if (session->no_oauth) {
+               if (!session->account) {
+                       fprintf(stdout, "Enter account for %s: ",
+                               session->hostname);
+                       session->account = session->readline(NULL);
+               }
+               if (!session->password) {
+                       read_password(password, sizeof(password),
+                                     session->hostname);
+                       session->password = strdup(password);
+               }
+       } else {
+               if (!session->access_token_key ||
+                   !session->access_token_secret) {
+                       request_access_token(session);
+                       goto exit;
+               }
+       }
+
        if (session->action == ACTION_UNKNOWN) {
                fprintf(stderr, "Unknown action, valid actions are:\n");
                fprintf(stderr, "'update', 'friends', 'public', "
@@ -1273,26 +1540,11 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
-       if (session->host == HOST_TWITTER && session->action == ACTION_GROUP) {
-               fprintf(stderr, "Groups only work in Identi.ca.\n");
-               goto exit;
-       }
-
        if (session->action == ACTION_GROUP && !session->group) {
                fprintf(stdout, "Enter group name: ");
                session->group = session->readline(NULL);
        }
 
-       if (!session->account) {
-               fprintf(stdout, "Enter account for %s: ", session->hostname);
-               session->account = session->readline(NULL);
-       }
-
-       if (!session->password) {
-               read_password(password, sizeof(password), session->hostname);
-               session->password = strdup(password);
-       }
-
        if (session->action == ACTION_UPDATE) {
                if (session->bash || !session->interactive)
                        tweet = get_string_from_stdin();
@@ -1317,14 +1569,9 @@ int main(int argc, char *argv[], char *envp[])
                dbg("tweet = %s\n", session->tweet);
        }
 
-       if (!session->user)
-               session->user = strdup(session->account);
-
        if (session->page == 0)
                session->page = 1;
        dbg("config file = %s\n", session->configfile);
-       dbg("account = %s\n", session->account);
-       dbg("password = %s\n", session->password);
        dbg("host = %d\n", session->host);
        dbg("action = %d\n", session->action);