-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 | |||
@@ -2,33 +2,35 @@ | |||
2 | #define __OPKELE_OAUTH_CONSUMER_H | 2 | #define __OPKELE_OAUTH_CONSUMER_H |
3 | 3 | ||
4 | #include <string> | 4 | #include <string> |
5 | #include <opkele/types.h> | 5 | #include <opkele/types.h> |
6 | #include <opkele/oauth.h> | 6 | #include <opkele/oauth.h> |
7 | #include <opkele/curl.h> | 7 | #include <opkele/curl.h> |
8 | 8 | ||
9 | namespace opkele { | 9 | namespace opkele { |
10 | namespace oauth { | 10 | namespace oauth { |
11 | using std::string; | 11 | using std::string; |
12 | 12 | ||
13 | enum oauth_method_t { | 13 | enum oauth_method_t { |
14 | oauth_auth_header, oauth_post_body, oauth_url_query | 14 | oauth_auth_header, oauth_post_body, oauth_url_query, |
15 | oauth_method_default = oauth_auth_header | ||
15 | }; | 16 | }; |
16 | 17 | ||
17 | struct service_endpoint_t { | 18 | struct service_endpoint_t { |
18 | string url; | 19 | string url; |
19 | string signature_method; | 20 | string signature_method; |
20 | oauth_method_t oauth_method; | 21 | oauth_method_t oauth_method; |
21 | 22 | ||
22 | service_endpoint_t(const string& u,const string& sm,oauth_method_t om) | 23 | service_endpoint_t() : oauth_method(oauth_method_default) { } |
24 | service_endpoint_t(const string& u,const string& sm,oauth_method_t om=oauth_method_default) | ||
23 | : url(u), signature_method(sm), oauth_method(om) { } | 25 | : url(u), signature_method(sm), oauth_method(om) { } |
24 | }; | 26 | }; |
25 | 27 | ||
26 | class basic_provider_endpoints { | 28 | class basic_provider_endpoints { |
27 | public: | 29 | public: |
28 | 30 | ||
29 | virtual ~basic_provider_endpoints() { } | 31 | virtual ~basic_provider_endpoints() { } |
30 | 32 | ||
31 | virtual const service_endpoint_t& get_request_token_endpoint() const = 0; | 33 | virtual const service_endpoint_t& get_request_token_endpoint() const = 0; |
32 | virtual const service_endpoint_t& get_authorize_user_endpoint() const = 0; | 34 | virtual const service_endpoint_t& get_authorize_user_endpoint() const = 0; |
33 | virtual const service_endpoint_t& get_access_token_endpoint() const = 0; | 35 | virtual const service_endpoint_t& get_access_token_endpoint() const = 0; |
34 | 36 | ||
@@ -56,34 +58,38 @@ namespace opkele { | |||
56 | 58 | ||
57 | basic_consumer(const token_t& ct) | 59 | basic_consumer(const token_t& ct) |
58 | : consumer_token(ct) { } | 60 | : consumer_token(ct) { } |
59 | virtual ~basic_consumer() { } | 61 | virtual ~basic_consumer() { } |
60 | 62 | ||
61 | virtual const basic_provider_endpoints& get_endpoints() const = 0; | 63 | virtual const basic_provider_endpoints& get_endpoints() const = 0; |
62 | virtual const string allocate_nonce(time_t ts) = 0; | 64 | virtual const string allocate_nonce(time_t ts) = 0; |
63 | 65 | ||
64 | token_t get_request_token(); | 66 | token_t get_request_token(); |
65 | const string get_authorize_url(const token_t& rt,const string& callback=""); | 67 | const string get_authorize_url(const token_t& rt,const string& callback=""); |
66 | token_t get_access_token(const token_t& rt); | 68 | token_t get_access_token(const token_t& rt); |
67 | 69 | ||
68 | void prepare_request( | 70 | http_request_t& prepare_request( |
69 | http_request_t& req, | 71 | http_request_t& req, |
70 | const basic_fields& qf,const basic_fields& pf, | 72 | const basic_fields& qf,const basic_fields& pf, |
71 | oauth_method_t om,const string& sm, | 73 | oauth_method_t om,const string& sm, |
72 | const token_t *t=0,const string& realm=""); | 74 | const token_t *t=0,const string& realm=""); |
73 | void prepare_request( | 75 | http_request_t& prepare_request( |
74 | http_request_t& req, | 76 | http_request_t& req, |
75 | const basic_fields& qf,const basic_fields& pf, | 77 | const basic_fields& qf,const basic_fields& pf, |
76 | const service_endpoint_t& sep, | 78 | const service_endpoint_t& sep, |
77 | const token_t *t=0,const string& realm=""); | 79 | const token_t *t=0,const string& realm=""); |
80 | http_request_t& prepare_request( | ||
81 | http_request_t& req, | ||
82 | const basic_fields& qf,const basic_fields& pf, | ||
83 | const token_t *t=0,const string& realm=""); | ||
78 | 84 | ||
79 | const string signature( | 85 | const string signature( |
80 | const string& method, | 86 | const string& method, |
81 | const string& url, | 87 | const string& url, |
82 | const basic_fields& fields, | 88 | const basic_fields& fields, |
83 | const token_t* rt=0); | 89 | const token_t* rt=0); |
84 | 90 | ||
85 | token_t acquire_token( | 91 | token_t acquire_token( |
86 | const service_endpoint_t& sep, | 92 | const service_endpoint_t& sep, |
87 | const token_t* rt=0); | 93 | const token_t* rt=0); |
88 | }; | 94 | }; |
89 | 95 | ||
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 | |||
@@ -147,25 +147,25 @@ namespace opkele { | |||
147 | if(!rv.key.empty()) /* TODO: specialize */ | 147 | if(!rv.key.empty()) /* TODO: specialize */ |
148 | throw opkele::exception(OPKELE_CP_ "found oauth_token twice"); | 148 | throw opkele::exception(OPKELE_CP_ "found oauth_token twice"); |
149 | rv.key = util::url_decode(part.substr(eq+1)); | 149 | rv.key = util::url_decode(part.substr(eq+1)); |
150 | }else if(n=="oauth_token_secret") { | 150 | }else if(n=="oauth_token_secret") { |
151 | if(!rv.secret.empty()) /* TODO: specialize */ | 151 | if(!rv.secret.empty()) /* TODO: specialize */ |
152 | throw opkele::exception(OPKELE_CP_ "found oauth_secret twice"); | 152 | throw opkele::exception(OPKELE_CP_ "found oauth_secret twice"); |
153 | rv.secret = util::url_decode(part.substr(eq+1)); | 153 | rv.secret = util::url_decode(part.substr(eq+1)); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | return rv; | 156 | return rv; |
157 | } | 157 | } |
158 | 158 | ||
159 | void basic_consumer::prepare_request( | 159 | http_request_t& basic_consumer::prepare_request( |
160 | http_request_t& req, | 160 | http_request_t& req, |
161 | const basic_fields& qf,const basic_fields& pf, | 161 | const basic_fields& qf,const basic_fields& pf, |
162 | oauth_method_t om,const string& sm, | 162 | oauth_method_t om,const string& sm, |
163 | const token_t *t,const string& realm) { | 163 | const token_t *t,const string& realm) { |
164 | fields_t op; | 164 | fields_t op; |
165 | op.set_field("oauth_consumer_key",consumer_token.key); | 165 | op.set_field("oauth_consumer_key",consumer_token.key); |
166 | if(t) op.set_field("oauth_token",t->key); | 166 | if(t) op.set_field("oauth_token",t->key); |
167 | op.set_field("oauth_signature_method",sm); | 167 | op.set_field("oauth_signature_method",sm); |
168 | time_t now; | 168 | time_t now; |
169 | op.set_field("oauth_timestamp", | 169 | op.set_field("oauth_timestamp", |
170 | util::long_to_string(time(&now))); | 170 | util::long_to_string(time(&now))); |
171 | op.set_field("oauth_nonce",allocate_nonce(now)); | 171 | op.set_field("oauth_nonce",allocate_nonce(now)); |
@@ -200,37 +200,49 @@ namespace opkele { | |||
200 | fields_t p; | 200 | fields_t p; |
201 | pf.append_to(p); op.append_to(p); | 201 | pf.append_to(p); op.append_to(p); |
202 | req.url = qf.append_query(req.url); | 202 | req.url = qf.append_query(req.url); |
203 | req.body = p.query_string(); | 203 | req.body = p.query_string(); |
204 | }else if(om==oauth_url_query) { | 204 | }else if(om==oauth_url_query) { |
205 | fields_t q; | 205 | fields_t q; |
206 | qf.append_to(q); op.append_to(q); | 206 | qf.append_to(q); op.append_to(q); |
207 | req.url = q.append_query(req.url); | 207 | req.url = q.append_query(req.url); |
208 | req.body = pf.query_string(); | 208 | req.body = pf.query_string(); |
209 | }else | 209 | }else |
210 | throw opkele::exception(OPKELE_CP_ /* TODO: specialize */ | 210 | throw opkele::exception(OPKELE_CP_ /* TODO: specialize */ |
211 | "Unknown oauth method"); | 211 | "Unknown oauth method"); |
212 | return req; | ||
212 | } | 213 | } |
213 | 214 | ||
214 | void basic_consumer::prepare_request( | 215 | http_request_t& basic_consumer::prepare_request( |
215 | http_request_t& req, | 216 | http_request_t& req, |
216 | const basic_fields& qf,const basic_fields& pf, | 217 | const basic_fields& qf,const basic_fields& pf, |
217 | const service_endpoint_t& sep, | 218 | const service_endpoint_t& sep, |
218 | const token_t *t,const string& realm) { | 219 | const token_t *t,const string& realm) { |
219 | prepare_request( | 220 | return prepare_request( |
220 | req, qf, pf, | 221 | req, qf, pf, |
221 | sep.oauth_method,sep.signature_method, | 222 | sep.oauth_method,sep.signature_method, |
222 | t,realm); | 223 | t,realm); |
223 | } | 224 | } |
224 | 225 | ||
226 | http_request_t& basic_consumer::prepare_request( | ||
227 | http_request_t& req, | ||
228 | const basic_fields& qf,const basic_fields& pf, | ||
229 | const token_t *t,const string& realm) { | ||
230 | service_endpoint_t sep; | ||
231 | return prepare_request( | ||
232 | req, qf, pf, | ||
233 | get_endpoints().get_url_endpoint(sep,req.url), | ||
234 | t, realm ); | ||
235 | } | ||
236 | |||
225 | void http_request_t::setup_curl(CURL *curl) { | 237 | void http_request_t::setup_curl(CURL *curl) { |
226 | CURLcode r; | 238 | CURLcode r; |
227 | r = curl_easy_setopt(curl,CURLOPT_URL,url.c_str()); | 239 | r = curl_easy_setopt(curl,CURLOPT_URL,url.c_str()); |
228 | if(r) | 240 | if(r) |
229 | throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); | 241 | throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); |
230 | if(method=="POST") { | 242 | if(method=="POST") { |
231 | (r = curl_easy_setopt(curl,CURLOPT_POST,1)) | 243 | (r = curl_easy_setopt(curl,CURLOPT_POST,1)) |
232 | || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDS,body.c_str())) | 244 | || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDS,body.c_str())) |
233 | || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,body.size())); | 245 | || (r = curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,body.size())); |
234 | }else if(method=="GET") { | 246 | }else if(method=="GET") { |
235 | r = curl_easy_setopt(curl,CURLOPT_HTTPGET,1); | 247 | r = curl_easy_setopt(curl,CURLOPT_HTTPGET,1); |
236 | }else if(method=="HEAD") { | 248 | }else if(method=="HEAD") { |