X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/7e0b69df8051efc3e11fdcfb9b2ee7ba6371f4f0..d90f61a7db7adadd41a4050c6e1a0a74e7456464:/bti.c diff --git a/bti.c b/bti.c index 8feb8da..20e6d7b 100644 --- a/bti.c +++ b/bti.c @@ -298,25 +298,25 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer) free(buffer); } -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 *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 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 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) { @@ -455,20 +455,22 @@ static int parse_osp_reply(const char *reply, char **token, char **secret) 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 (!strncmp(rv[0], "oauth_token=", 11) && + !strncmp(rv[1], "oauth_token_secret=", 18)) { if (token) - *token =strdup(&(rv[0][12])); + *token = strdup(&(rv[0][12])); if (secret) - *secret=strdup(&(rv[1][19])); + *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 (!strncmp(rv[1], "oauth_token=", 11) && + !strncmp(rv[2], "oauth_token_secret=", 18)) { if (token) - *token =strdup(&(rv[1][12])); + *token = strdup(&(rv[1][12])); if (secret) - *secret=strdup(&(rv[2][19])); + *secret = strdup(&(rv[2][19])); retval = 0; } @@ -482,7 +484,6 @@ static int parse_osp_reply(const char *reply, char **token, char **secret) return retval; } - static int request_access_token(struct session *session) { @@ -529,15 +530,18 @@ static int request_access_token(struct session *session) 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); + 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); + 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); + session->consumer_key, + session->consumer_secret, + at_key, at_secret); reply = oauth_http_get(request_url, post_params); if (!reply) @@ -548,8 +552,8 @@ static int request_access_token(struct session *session) free(reply); - fprintf(stdout, "Please put these two lines in your bti configuration "); - fprintf(stdout, "file (~/.bti):\n"); + 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); @@ -592,72 +596,75 @@ static int send_request(struct session *session) 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); + 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) curl_formadd(&formpost, &lastptr, - CURLFORM_COPYNAME, "status", - CURLFORM_COPYCONTENTS, session->tweet, - CURLFORM_END); + CURLFORM_COPYNAME, "in_reply_to_status_id", + CURLFORM_COPYCONTENTS, session->replyto, + CURLFORM_END); - curl_formadd(&formpost, &lastptr, - CURLFORM_COPYNAME, "source", - CURLFORM_COPYCONTENTS, "bti", - CURLFORM_END); - - if (session->replyto) - curl_formadd(&formpost, &lastptr, - CURLFORM_COPYNAME, "in_reply_to_status_id", - CURLFORM_COPYCONTENTS, session->replyto, - CURLFORM_END); - - curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); - slist = curl_slist_append(slist, "Expect:"); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); - - sprintf(endpoint, "%s%s", session->hosturl, update_uri); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); - 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); - - 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); - - 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); - - break; - case ACTION_PUBLIC: - sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri, - session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - - 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); - - break; - default: - break; + curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); + slist = curl_slist_append(slist, "Expect:"); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); + + sprintf(endpoint, "%s%s", session->hosturl, update_uri); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); + 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); + 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); + 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); + break; + + case ACTION_PUBLIC: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + public_uri, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + 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); + break; + + default: + break; } if (session->proxy) @@ -687,52 +694,51 @@ static int send_request(struct session *session) 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; + 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 - ); + 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 - ); + 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); } @@ -1355,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; @@ -1462,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; @@ -1492,7 +1500,7 @@ int main(int argc, char *argv[], char *envp[]) if (session->host == HOST_TWITTER) { if (!session->consumer_key || !session->consumer_secret) { - fprintf(stderr, "Twitter no longer supuports HTTP basic authentication.\n"); + fprintf(stderr, "Twitter no longer supports 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; @@ -1502,25 +1510,27 @@ int main(int argc, char *argv[], char *envp[]) goto exit; } } else { - if (!session->consumer_key || !session->consumer_secret) { + 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); + fprintf(stdout, "Enter account for %s: ", + session->hostname); session->account = session->readline(NULL); } if (!session->password) { - read_password(password, sizeof(password), session->hostname); + read_password(password, sizeof(password), + session->hostname); session->password = strdup(password); } } else { - if (!session->access_token_key || !session->access_token_secret) { + if (!session->access_token_key || + !session->access_token_secret) { request_access_token(session); goto exit; - } + } } if (session->action == ACTION_UNKNOWN) {