-rw-r--r-- | include/opkele/oauth.h | 2 | ||||
-rw-r--r-- | lib/oauth-consumer.cc | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/opkele/oauth.h b/include/opkele/oauth.h index 14d0586..bc6c2fa 100644 --- a/include/opkele/oauth.h +++ b/include/opkele/oauth.h | |||
@@ -9,14 +9,16 @@ namespace opkele { | |||
9 | 9 | ||
10 | struct token_t { | 10 | struct token_t { |
11 | string key; | 11 | string key; |
12 | string secret; | 12 | string secret; |
13 | 13 | ||
14 | token_t() { } | 14 | token_t() { } |
15 | token_t(const string& k,const string& s) | 15 | token_t(const string& k,const string& s) |
16 | : key(k), secret(s) { } | 16 | : key(k), secret(s) { } |
17 | |||
18 | bool empty() const { return key.empty() && secret.empty(); } | ||
17 | }; | 19 | }; |
18 | 20 | ||
19 | } | 21 | } |
20 | } | 22 | } |
21 | 23 | ||
22 | #endif /* __OPKELE_OAUTH_H */ | 24 | #endif /* __OPKELE_OAUTH_H */ |
diff --git a/lib/oauth-consumer.cc b/lib/oauth-consumer.cc index bb4e89b..0d31ec7 100644 --- a/lib/oauth-consumer.cc +++ b/lib/oauth-consumer.cc | |||
@@ -125,16 +125,21 @@ namespace opkele { | |||
125 | "invalid oauth_method for request_token endpoint"); | 125 | "invalid oauth_method for request_token endpoint"); |
126 | }; | 126 | }; |
127 | if(r) | 127 | if(r) |
128 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); | 128 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); |
129 | if( (r=curl.easy_setopt(CURLOPT_URL,hr.url.c_str())) ) | 129 | if( (r=curl.easy_setopt(CURLOPT_URL,hr.url.c_str())) ) |
130 | throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); | 130 | throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); |
131 | if( (r=curl.easy_perform()) ) | 131 | if( (r=curl.easy_perform()) ) |
132 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); | 132 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
133 | long response_code; | ||
134 | if( (r=curl.easy_getinfo(CURLINFO_RESPONSE_CODE,&response_code)) ) | ||
135 | throw exception_curl(OPKELE_CP_ "failed to retrieve curl response code",r); | ||
136 | if(response_code!=200) /* TODO: specialize exception */ | ||
137 | throw exception(OPKELE_CP_ "invalid response from the OAuth provider"); | ||
133 | token_t rv; | 138 | token_t rv; |
134 | string::size_type p=0; | 139 | string::size_type p=0; |
135 | while(p!=string::npos) { | 140 | while(p!=string::npos) { |
136 | string::size_type np = curl.response.find('&',p); | 141 | string::size_type np = curl.response.find('&',p); |
137 | string part; | 142 | string part; |
138 | if(np==string::npos) { | 143 | if(np==string::npos) { |
139 | part.assign(curl.response.c_str()+p); p = string::npos; | 144 | part.assign(curl.response.c_str()+p); p = string::npos; |
140 | }else{ | 145 | }else{ |
@@ -148,16 +153,18 @@ namespace opkele { | |||
148 | throw opkele::exception(OPKELE_CP_ "found oauth_token twice"); | 153 | throw opkele::exception(OPKELE_CP_ "found oauth_token twice"); |
149 | rv.key = util::url_decode(part.substr(eq+1)); | 154 | rv.key = util::url_decode(part.substr(eq+1)); |
150 | }else if(n=="oauth_token_secret") { | 155 | }else if(n=="oauth_token_secret") { |
151 | if(!rv.secret.empty()) /* TODO: specialize */ | 156 | if(!rv.secret.empty()) /* TODO: specialize */ |
152 | throw opkele::exception(OPKELE_CP_ "found oauth_secret twice"); | 157 | throw opkele::exception(OPKELE_CP_ "found oauth_secret twice"); |
153 | rv.secret = util::url_decode(part.substr(eq+1)); | 158 | rv.secret = util::url_decode(part.substr(eq+1)); |
154 | } | 159 | } |
155 | } | 160 | } |
161 | if(rv.empty()) /* TODO: specialize */ | ||
162 | throw exception(OPKELE_CP_ "failed to retrieve token from OAuth provider response"); | ||
156 | return rv; | 163 | return rv; |
157 | } | 164 | } |
158 | 165 | ||
159 | http_request_t& basic_consumer::prepare_request( | 166 | http_request_t& basic_consumer::prepare_request( |
160 | http_request_t& req, | 167 | http_request_t& req, |
161 | const basic_fields& qf,const basic_fields& pf, | 168 | const basic_fields& qf,const basic_fields& pf, |
162 | oauth_method_t om,const string& sm, | 169 | oauth_method_t om,const string& sm, |
163 | const token_t *t,const string& realm) { | 170 | const token_t *t,const string& realm) { |