| -rw-r--r-- | lib/oauth-consumer.cc | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/lib/oauth-consumer.cc b/lib/oauth-consumer.cc index d717ed3..bb4e89b 100644 --- a/lib/oauth-consumer.cc +++ b/lib/oauth-consumer.cc @@ -147,25 +147,25 @@ namespace opkele { if(!rv.key.empty()) /* TODO: specialize */ throw opkele::exception(OPKELE_CP_ "found oauth_token twice"); rv.key = util::url_decode(part.substr(eq+1)); }else if(n=="oauth_token_secret") { if(!rv.secret.empty()) /* TODO: specialize */ throw opkele::exception(OPKELE_CP_ "found oauth_secret twice"); rv.secret = util::url_decode(part.substr(eq+1)); } } return rv; } - void basic_consumer::prepare_request( + http_request_t& basic_consumer::prepare_request( http_request_t& req, const basic_fields& qf,const basic_fields& pf, oauth_method_t om,const string& sm, const token_t *t,const string& realm) { fields_t op; op.set_field("oauth_consumer_key",consumer_token.key); if(t) op.set_field("oauth_token",t->key); op.set_field("oauth_signature_method",sm); time_t now; op.set_field("oauth_timestamp", util::long_to_string(time(&now))); op.set_field("oauth_nonce",allocate_nonce(now)); @@ -200,37 +200,77 @@ namespace opkele { fields_t p; pf.append_to(p); op.append_to(p); req.url = qf.append_query(req.url); req.body = p.query_string(); }else if(om==oauth_url_query) { fields_t q; qf.append_to(q); op.append_to(q); req.url = q.append_query(req.url); req.body = pf.query_string(); }else throw opkele::exception(OPKELE_CP_ /* TODO: specialize */ "Unknown oauth method"); + return req; } - void basic_consumer::prepare_request( + http_request_t& basic_consumer::prepare_request( http_request_t& req, const basic_fields& qf,const basic_fields& pf, const service_endpoint_t& sep, const token_t *t,const string& realm) { - prepare_request( + return prepare_request( req, qf, pf, sep.oauth_method,sep.signature_method, t,realm); } + http_request_t& basic_consumer::prepare_request( + http_request_t& req, + const basic_fields& qf,const basic_fields& pf, + const token_t *t,const string& realm) { + service_endpoint_t sep; + return prepare_request( + req, qf, pf, + get_endpoints().get_url_endpoint(sep,req.url), + t, realm ); + } + + void http_request_t::setup_curl(CURL *curl) { + CURLcode r; + r = curl_easy_setopt(curl,CURLOPT_URL,url.c_str()); + if(r) + throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); + if(method=="POST") { + (r = curl_easy_setopt(curl,CURLOPT_POST,1)) + || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDS,body.c_str())) + || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,body.size())); + }else if(method=="GET") { + r = curl_easy_setopt(curl,CURLOPT_HTTPGET,1); + }else if(method=="HEAD") { + r = curl_easy_setopt(curl,CURLOPT_NOBODY,1); + }else /* TODO: specialize exception */ + throw exception(OPKELE_CP_ "don't know how to handle http method"); + if(r) + throw exception_curl(OPKELE_CP_ "failed to set curly options",r); + if(!authorize_header.empty()) { + r = curl_easy_setopt(curl,CURLOPT_HTTPHEADER,(curl_slist*)( + _curl_headers_list = curl_slist_append( + 0,string("Authorization: "+authorize_header).c_str() + ) + ) ); + if(r) + throw exception_curl(OPKELE_CP_ "failed to setup curlie header"); + } + } + const basic_provider_endpoints& simple_consumer::get_endpoints() const { return peps; } const string simple_consumer::allocate_nonce(time_t ts) { # ifndef HAVE_LIBUUID throw opkele::not_implemented(OPKELE_CP_ "not implemented consumer's allocate_nonce()"); # else /* HAVE_LIBUUID */ uuid_t uuid; uuid_generate(uuid); return util::encode_base64(uuid,sizeof(uuid)); # endif /* HAVE_LIBUUID */ |