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-oauth2.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'sca-cpp/trunk/modules/oauth/mod-oauth2.cpp') diff --git a/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp b/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp index bedf83325f..5bc212a681 100644 --- a/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp +++ b/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp @@ -58,7 +58,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; @@ -90,7 +90,7 @@ public: const char* const dir; bool enabled; gc_mutable_ref login; - gc_mutable_ref > > scopeattrs; + gc_mutable_ref > scopeattrs; gc_mutable_ref > apcs; }; @@ -133,7 +133,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)) { @@ -172,7 +172,7 @@ const failable authenticated(const list >& userinfo, const bool /** * Handle an authorize request. */ -const failable authorize(const list >& args, request_rec* const r, const list >& appkeys) { +const failable authorize(const list& args, request_rec* const r, const list& appkeys) { // Extract authorize, access_token, client ID and info URIs const list ref = assoc("openauth_referrer", args); if (isNil(ref) || isNil(cdr(ref))) @@ -199,7 +199,7 @@ const failable authorize(const list >& args, request_rec* const debug(redir, "modoauth2::authorize::redir"); // Build the state URI - const list > stargs = mklist >(tok, cid, info, ref); + const list stargs = mklist(tok, cid, info, ref); const string state = http::queryString(stargs); debug(state, "modoauth2::authorize::state"); @@ -211,7 +211,7 @@ const failable authorize(const list >& args, request_rec* const // Redirect to the authorize URI const list adisplay = (isNil(display) || isNil(cdr(display)))? nilListValue : mklist("display", cadr(display)); - const list > aargs = mklist >(mklist("response_type", "code"), mklist("client_id", car(appkey)), mklist("scope", cadr(scope)), adisplay, mklist("redirect_uri", httpd::escape(redir)), mklist("state", httpd::escape(state))); + const list aargs = mklist(mklist("response_type", "code"), mklist("client_id", car(appkey)), mklist("scope", cadr(scope)), adisplay, mklist("redirect_uri", httpd::escape(redir)), mklist("state", httpd::escape(state))); const string uri = httpd::unescape(cadr(auth)) + string("?") + http::queryString(aargs); debug(uri, "modoauth2::authorize::uri"); return httpd::externalRedirect(uri, r); @@ -229,13 +229,13 @@ const failable > profileUserInfo(const value& cid, const list /** * Handle an access_token request. */ -const failable accessToken(const list >& args, request_rec* r, const list >& appkeys, const http::CURLSession& cs, const list >& scopeattrs, const list& apcs, const memcache::MemCached& mc) { +const failable accessToken(const list& args, request_rec* r, const list& appkeys, const http::CURLSession& cs, const list& scopeattrs, const list& apcs, const memcache::MemCached& mc) { // Extract access_token URI, client ID and authorization code parameters const list state = assoc("state", args); if (isNil(state) || isNil(cdr(state))) return mkfailure("Missing state parameter"); - const list >& stargs = httpd::queryArgs(httpd::unescape(cadr(state))); + const list& stargs = httpd::queryArgs(httpd::unescape(cadr(state))); const list ref = assoc("openauth_referrer", stargs); if (isNil(ref) || isNil(cdr(ref))) return mkfailure("Missing openauth_referrer parameter"); @@ -263,7 +263,7 @@ const failable accessToken(const list >& args, request_rec* r, debug(redir, "modoauth2::access_token::redir"); // Request access token - const list > targs = mklist >(mklist("client_id", car(appkey)), mklist("redirect_uri", httpd::escape(redir)), mklist("client_secret", cadr(appkey)), code, mklist("grant_type", "authorization_code")); + const list targs = mklist(mklist("client_id", car(appkey)), mklist("redirect_uri", httpd::escape(redir)), mklist("client_secret", cadr(appkey)), code, mklist("grant_type", "authorization_code")); const string tqs = http::queryString(targs); debug(tqs, "modoauth2::access_token::tokenqs"); const string turi = httpd::unescape(cadr(tok)); @@ -285,7 +285,7 @@ const failable accessToken(const list >& args, request_rec* r, // Request user info // TODO Make this step configurable - const list > iargs = mklist >(tv); + const list iargs = mklist(tv); const string iuri = httpd::unescape(cadr(info)) + string("?") + http::queryString(iargs); debug(iuri, "modoauth2::access_token::infouri"); const failable profres = http::get(iuri, cs); @@ -350,7 +350,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) == "/oauth2/authorize/") { @@ -390,7 +390,7 @@ int postConfigMerge(const ServerConf& mainsc, server_rec* const s) { debug(httpd::serverName(s), "modoauth2::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; @@ -450,7 +450,7 @@ void childInit(apr_pool_t* const p, server_rec* const s) { char* 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_oauth2); - 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) { @@ -492,7 +492,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