summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/Makefile.am3
-rw-r--r--include/opkele/oauth/consumer.h19
-rw-r--r--lib/oauth-consumer.cc46
-rw-r--r--test/Makefile.am5
-rw-r--r--test/test-oauth-consumer.cc22
5 files changed, 68 insertions, 27 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index b41e6cc..2ae510d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,11 +21,12 @@ nobase_include_HEADERS = \
opkele/basic_op.h opkele/verify_op.h \
opkele/util.h \
opkele/oauth.h opkele/oauth/consumer.h \
+ opkele/curl.h \
${NODIST_HEADERS_}
noinst_HEADERS = \
opkele/data.h \
- opkele/curl.h opkele/expat.h opkele/tidy.h \
+ opkele/expat.h opkele/tidy.h \
opkele/util-internal.h \
opkele/debug.h \
opkele/discovery.h
diff --git a/include/opkele/oauth/consumer.h b/include/opkele/oauth/consumer.h
index 1e2784c..eb4f753 100644
--- a/include/opkele/oauth/consumer.h
+++ b/include/opkele/oauth/consumer.h
@@ -4,13 +4,15 @@
#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 {
@@ -18,7 +20,8 @@ namespace opkele {
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) { }
};
@@ -41,8 +44,12 @@ namespace opkele {
string url;
string body;
+ util::curl_slist_t _curl_headers_list;
+
http_request_t(const string& m,const string& u)
: method(m), url(u) { }
+
+ void setup_curl(CURL *curl);
};
class basic_consumer {
@@ -60,16 +67,20 @@ namespace opkele {
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,
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
@@ -156,7 +156,7 @@ namespace opkele {
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,
@@ -209,19 +209,59 @@ namespace opkele {
}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; }
diff --git a/test/Makefile.am b/test/Makefile.am
index f0c0ea8..7cfe3a4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,5 @@
-noinst_PROGRAMS = test idiscover RP.cgi OP.cgi test-oauth-consumer
+noinst_PROGRAMS = test idiscover test-oauth-consumer \
+ ${_dependent_programs_}
AM_CPPFLAGS=${CPPFLAGS_DEBUG}
DEFAULT_INCLUDES = -I${top_builddir}
@@ -21,6 +22,8 @@ if HAVE_SQLITE3
if HAVE_UUID
if HAVE_KINGATE
+_dependent_programs_ = RP.cgi OP.cgi
+
RP_cgi_SOURCES = RP.cc
nodist_RP_cgi_SOURCES = RP-db.cc
RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \
diff --git a/test/test-oauth-consumer.cc b/test/test-oauth-consumer.cc
index 3b3ca70..b3ddef5 100644
--- a/test/test-oauth-consumer.cc
+++ b/test/test-oauth-consumer.cc
@@ -38,28 +38,14 @@ int main(int,char**) {
opkele::util::curl_pick_t curl = opkele::util::curl_t::easy_init();
opkele::oauth::http_request_t hr("POST",
"http://term.ie/oauth/example/echo_api.php");
- sc.prepare_request(hr,
- opkele::fields_t(),test,
- opkele::oauth::oauth_auth_header,"HMAC-SHA1",
- &at,"realm");
- DOUT_("url: " << hr.url << endl
- << "body: " << hr.body << endl
- << "header: " << hr.authorize_header);
- opkele::util::curl_slist_t rh;
- rh.append("Authorization: "+hr.authorize_header);
- CURLcode r;
- (r=curl.misc_sets())
- || (r=curl.set_write())
- || (r=curl.easy_setopt(CURLOPT_HTTPHEADER,rh) )
- || (r=curl.easy_setopt(CURLOPT_URL,hr.url.c_str()))
- || (r=curl.easy_setopt(CURLOPT_POST,1))
- || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,hr.body.c_str()))
- || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,hr.body.size()));
+ CURLcode r = curl.misc_sets();
+ r || (r=curl.set_write());
if(r)
throw opkele::exception_curl(OPKELE_CP_ "failed to set curly options",r);
+ sc.prepare_request(hr,opkele::fields_t(),test,&at).setup_curl(curl);
if( (r=curl.easy_perform()) )
throw opkele::exception_curl(OPKELE_CP_ "failed to perform curly request",r);
- DOUT_("Response: " << endl << curl.response);
+ cout << "Response: " << curl.response << endl;
#ifdef OPKELE_HAVE_KONFORKA
}catch(konforka::exception& e) {