| -rw-r--r-- | include/opkele/oauth/consumer.h | 14 | ||||
| -rw-r--r-- | lib/oauth-consumer.cc | 18 |
2 files changed, 25 insertions, 7 deletions
diff --git a/include/opkele/oauth/consumer.h b/include/opkele/oauth/consumer.h index 9196297..eb4f753 100644 --- a/include/opkele/oauth/consumer.h +++ b/include/opkele/oauth/consumer.h @@ -1,38 +1,40 @@ #ifndef __OPKELE_OAUTH_CONSUMER_H #define __OPKELE_OAUTH_CONSUMER_H #include <string> #include <opkele/types.h> #include <opkele/oauth.h> #include <opkele/curl.h> namespace opkele { namespace oauth { using std::string; enum oauth_method_t { - oauth_auth_header, oauth_post_body, oauth_url_query + oauth_auth_header, oauth_post_body, oauth_url_query, + oauth_method_default = oauth_auth_header }; struct service_endpoint_t { string url; string signature_method; oauth_method_t oauth_method; - service_endpoint_t(const string& u,const string& sm,oauth_method_t om) + service_endpoint_t() : oauth_method(oauth_method_default) { } + service_endpoint_t(const string& u,const string& sm,oauth_method_t om=oauth_method_default) : url(u), signature_method(sm), oauth_method(om) { } }; class basic_provider_endpoints { public: virtual ~basic_provider_endpoints() { } virtual const service_endpoint_t& get_request_token_endpoint() const = 0; virtual const service_endpoint_t& get_authorize_user_endpoint() const = 0; virtual const service_endpoint_t& get_access_token_endpoint() const = 0; virtual service_endpoint_t& get_url_endpoint(service_endpoint_t& sep, const string& url) const = 0; }; @@ -52,42 +54,46 @@ namespace opkele { class basic_consumer { public: token_t consumer_token; basic_consumer(const token_t& ct) : consumer_token(ct) { } virtual ~basic_consumer() { } virtual const basic_provider_endpoints& get_endpoints() const = 0; virtual const string allocate_nonce(time_t ts) = 0; token_t get_request_token(); const string get_authorize_url(const token_t& rt,const string& callback=""); token_t get_access_token(const token_t& rt); - void prepare_request( + http_request_t& 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=0,const string& realm=""); - void prepare_request( + http_request_t& prepare_request( http_request_t& req, const basic_fields& qf,const basic_fields& pf, const service_endpoint_t& sep, const token_t *t=0,const string& realm=""); + http_request_t& prepare_request( + http_request_t& req, + const basic_fields& qf,const basic_fields& pf, + const token_t *t=0,const string& realm=""); const string signature( const string& method, const string& url, const basic_fields& fields, const token_t* rt=0); token_t acquire_token( const service_endpoint_t& sep, const token_t* rt=0); }; class simple_provider_endpoints : public basic_provider_endpoints { public: service_endpoint_t sep_request_token; service_endpoint_t sep_authorize_user; diff --git a/lib/oauth-consumer.cc b/lib/oauth-consumer.cc index 0c4c9e3..bb4e89b 100644 --- a/lib/oauth-consumer.cc +++ b/lib/oauth-consumer.cc @@ -143,33 +143,33 @@ namespace opkele { string::size_type eq = part.find('='); if(eq==string::npos) continue; string n(part,0,eq); if(n=="oauth_token") { 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)); op.set_field("oauth_version","1.0"); /* TODO: normalize and strip down url */ { fields_t af; /* TODO: optimize, I don't want it to be copied */ @@ -196,45 +196,57 @@ namespace opkele { req.body = pf.query_string(); }else if(om==oauth_post_body) { assert(req.method=="POST"); /* TODO: optimize, don't copy it over and over */ 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) |