From 157ca678dee75e7881a0198425d0c8328f0bee04 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Thu, 3 Jan 2013 07:41:02 +0000 Subject: Improve handling of nested lists, trees, null and floating point values. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428191 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/oauth/mod-oauth1.cpp | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'sca-cpp/trunk/modules/oauth/mod-oauth1.cpp') diff --git a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp index c9d8607144..a7238804f8 100644 --- a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp +++ b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp @@ -64,7 +64,7 @@ public: gc_mutable_ref ca; gc_mutable_ref cert; gc_mutable_ref key; - gc_mutable_ref > > appkeys; + gc_mutable_ref > appkeys; gc_mutable_ref > mcaddrs; gc_mutable_ref mc; gc_mutable_ref > cs; @@ -96,7 +96,7 @@ public: const char* const dir; bool enabled; gc_mutable_ref login; - gc_mutable_ref > > scopeattrs; + gc_mutable_ref > scopeattrs; gc_mutable_ref > apcs; }; @@ -139,7 +139,7 @@ const failable userInfo(const value& sid, const memcache::MemCached& mc) /** * Handle an authenticated request. */ -const failable authenticated(const list >& userinfo, const bool check, request_rec* const r, const list >& scopeattrs, const list& apcs) { +const failable authenticated(const list& userinfo, const bool check, request_rec* const r, const list& scopeattrs, const list& apcs) { debug(userinfo, "modoauth2::authenticated::userinfo"); if (isNil(scopeattrs)) { @@ -179,7 +179,7 @@ const failable authenticated(const list >& userinfo, const bool * Convert a query string containing oauth args to an authorization header. */ const string header(const string& qs, const string& redir, const string& verif) { - const list > args = httpd::queryArgs(qs); + const list args = httpd::queryArgs(qs); ostringstream hdr; hdr << "Authorization: OAuth " << "oauth_nonce=\"" << string(cadr(assoc("oauth_nonce", args))) << "\", "; @@ -220,7 +220,7 @@ const list sign(const string& verb, const string& uri, const list /** * Handle an authorize request. */ -const failable authorize(const list >& args, request_rec* const r, const list >& appkeys, const memcache::MemCached& mc) { +const failable authorize(const list& args, request_rec* const r, const list& appkeys, const memcache::MemCached& mc) { // Extract authorize, access_token, client ID and info URIs const list ref = assoc("openauth_referrer", args); if (isNil(ref) || isNil(cdr(ref))) @@ -242,7 +242,7 @@ const failable authorize(const list >& args, request_rec* const return mkfailure("Missing oauth1_info parameter"); // Build the redirect URI - const list > redirargs = mklist >(tok, cid, info, ref); + const list redirargs = mklist(tok, cid, info, ref); const string redir = httpd::url("/oauth1/access_token/", r) + string("?") + http::queryString(redirargs); debug(redir, "modoauth1::authorize::redir"); @@ -253,7 +253,7 @@ const failable authorize(const list >& args, request_rec* const list appkey = cadr(app); // Build and sign the request token URI - const string requri = httpd::unescape(cadr(req)) + string("&") + http::queryString(mklist >(mklist("oauth_callback", httpd::escape(redir)))); + const string requri = httpd::unescape(cadr(req)) + string("&") + http::queryString(mklist(mklist("oauth_callback", httpd::escape(redir)))); const list srequri = sign("POST", requri, appkey, emptyString, emptyString); debug(srequri, "modoauth1::authorize::srequri"); @@ -267,7 +267,7 @@ const failable authorize(const list >& args, request_rec* const const string res(pres); free(pres); debug(res, "modoauth1::authorize::res"); - const list > resargs = httpd::queryArgs(res); + const list resargs = httpd::queryArgs(res); // Retrieve the request token const list conf = assoc("oauth_callback_confirmed", resargs); @@ -286,7 +286,7 @@ const failable authorize(const list >& args, request_rec* const return mkfailure(prc); // Redirect to the authorize URI - const string authuri = httpd::unescape(cadr(auth)) + string("?") + http::queryString(mklist >(tv)); + const string authuri = httpd::unescape(cadr(auth)) + string("?") + http::queryString(mklist(tv)); debug(authuri, "modoauth1::authorize::authuri"); return httpd::externalRedirect(authuri, r); } @@ -343,7 +343,7 @@ const failable > profileUserInfo(const value& cid, const string& inf /** * Handle an access_token request. */ -const failable accessToken(const list >& args, request_rec* r, const list >& appkeys, const list >& scopeattrs, const list& apcs, const memcache::MemCached& mc) { +const failable accessToken(const list& args, request_rec* r, const list& appkeys, const list& scopeattrs, const list& apcs, const memcache::MemCached& mc) { // Extract access_token URI, client ID and verification code const list ref = assoc("openauth_referrer", args); @@ -377,7 +377,7 @@ const failable accessToken(const list >& args, request_rec* r, return mkfailure(sv); // Build and sign access token request URI - const string tokuri = httpd::unescape(cadr(tok)) + string("?") + http::queryString(mklist >(vv)); + const string tokuri = httpd::unescape(cadr(tok)) + string("?") + http::queryString(mklist(vv)); const list stokuri = sign("POST", tokuri, appkey, cadr(tv), content(sv)); debug(stokuri, "modoauth1::access_token::stokuri"); @@ -391,7 +391,7 @@ const failable accessToken(const list >& args, request_rec* r, const string tokres(ptokres); free(ptokres); debug(tokres, "modoauth1::access_token::res"); - const list > tokresargs = httpd::queryArgs(tokres); + const list tokresargs = httpd::queryArgs(tokres); // Retrieve the access token const list atv = assoc("oauth_token", tokresargs); @@ -475,7 +475,7 @@ static int checkAuthn(request_rec *r) { } // Get the request args - const list > args = httpd::queryArgs(r); + const list args = httpd::queryArgs(r); // Handle OAuth authorize request step if (string(r->uri) == "/oauth1/authorize/") { @@ -515,7 +515,7 @@ int postConfigMerge(const ServerConf& mainsc, server_rec* const s) { debug(httpd::serverName(s), "modoauth1::postConfigMerge::serverName"); // Merge configuration from main server - if (isNil((list >)sc.appkeys)) + if (isNil((list)sc.appkeys)) sc.appkeys = mainsc.appkeys; if (isNil((list)sc.mcaddrs)) sc.mcaddrs = mainsc.mcaddrs; @@ -575,7 +575,7 @@ void childInit(apr_pool_t* const p, server_rec* const s) { char* const confAppKey(cmd_parms* cmd, unused void *c, char *arg1, char* arg2, char* arg3) { const gc_scoped_pool sp(cmd->pool); ServerConf& sc = httpd::serverConf(cmd, &mod_tuscany_oauth1); - sc.appkeys = cons >(mklist(arg1, mklist(arg2, arg3)), (list >)sc.appkeys); + sc.appkeys = cons(mklist(arg1, mklist(arg2, arg3)), (list)sc.appkeys); return NULL; } char* confMemcached(cmd_parms *cmd, unused void *c, char *arg) { @@ -617,7 +617,7 @@ char* confCertKeyFile(cmd_parms *cmd, unused void *c, char *arg) { char* confScopeAttr(cmd_parms *cmd, void* c, char* arg1, char* arg2) { const gc_scoped_pool sp(cmd->pool); DirConf& dc = httpd::dirConf(c); - dc.scopeattrs = cons >(mklist(arg1, arg2), (list >)dc.scopeattrs); + dc.scopeattrs = cons(mklist(arg1, arg2), (list)dc.scopeattrs); return NULL; } char* confAuthnProvider(cmd_parms *cmd, void *c, char* arg) { -- cgit v1.2.3