diff options
| author | Damien F. Katz <damien@apache.org> | 2009-08-04 19:50:46 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-08-04 19:50:46 +0000 |
| commit | 8e2215ee6306b0f4c13553796d401e9f5f93bcb6 (patch) | |
| tree | 948b9179887e73379bc445b9ad058de3a0bbe870 /src/couchdb/couch_httpd_external.erl | |
| parent | fd72a9bc48ebab76976f538c28459a0e26aa1750 (diff) | |
Initial check-in of OAuth and cookie authentication.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@800938 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_external.erl')
| -rw-r--r-- | src/couchdb/couch_httpd_external.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_external.erl b/src/couchdb/couch_httpd_external.erl index 4ff01d9e..d6fa945f 100644 --- a/src/couchdb/couch_httpd_external.erl +++ b/src/couchdb/couch_httpd_external.erl @@ -57,7 +57,8 @@ process_external_req(HttpReq, Db, Name) -> json_req_obj(#httpd{mochi_req=Req, method=Verb, path_parts=Path, - req_body=ReqBody + req_body=ReqBody, + user_ctx=#user_ctx{name=UserName, roles=UserRoles} }, Db) -> Body = case ReqBody of undefined -> Req:recv_body(); @@ -69,6 +70,7 @@ json_req_obj(#httpd{mochi_req=Req, _ -> [] end, + UserCtx = {[{<<"name">>, UserName}, {<<"roles">>, UserRoles}]}, Headers = Req:get(headers), Hlist = mochiweb_headers:to_list(Headers), {ok, Info} = couch_db:get_db_info(Db), @@ -80,7 +82,8 @@ json_req_obj(#httpd{mochi_req=Req, {<<"headers">>, to_json_terms(Hlist)}, {<<"body">>, Body}, {<<"form">>, to_json_terms(ParsedForm)}, - {<<"cookie">>, to_json_terms(Req:parse_cookie())}]}. + {<<"cookie">>, to_json_terms(Req:parse_cookie())}, + {<<"userCtx">>, UserCtx}]}. to_json_terms(Data) -> to_json_terms(Data, []). |