diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-06-25 05:30:51 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-06-25 05:30:51 +0000 |
| commit | 6d88c8c6d66772a1dac1d351405eff9c513d263e (patch) | |
| tree | 88392cfcbae52f4cd5daab8bef491dd3d90cb4ed | |
| parent | a3886989b9e09ca5d01e18f1e39e9dae0f280530 (diff) | |
make the authentication redirect URL configurable. setting it to the empty string yields the 0.11 behavior
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@957805 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 1 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd.erl | 21 | ||||
| -rw-r--r-- | src/couchdb/couch_rep_writer.erl | 1 |
3 files changed, 14 insertions, 9 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 7b9ac37c..af6b9bf4 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -29,6 +29,7 @@ include_sasl = true [couch_httpd_auth] authentication_db = _users +authentication_redirect = /_utils/session.html require_valid_user = false timeout = 600 ; number of seconds before automatic logout auth_cache_size = 50 ; size is number of cache entries diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index 1049aa9d..ef930147 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -745,14 +745,19 @@ error_headers(#httpd{mochi_req=MochiReq}=Req, Code, ErrorStr, ReasonStr) -> % redirect to the session page. case ErrorStr of <<"unauthorized">> -> - % if the accept header matches html, then do the redirect. else proceed as usual. - case re:run(MochiReq:get_header_value("Accept"), "html", [{capture, none}]) of - nomatch -> - {Code, []}; - match -> - UrlReturn = ?l2b(couch_util:url_encode(MochiReq:get(path))), - UrlReason = ?l2b(couch_util:url_encode(ReasonStr)), - {302, [{"Location", couch_httpd:absolute_uri(Req, <<"/_utils/session.html?return=",UrlReturn/binary,"&reason=",UrlReason/binary>>)}]} + case couch_config:get("couch_httpd_auth", "authentication_redirect", nil) of + nil -> {Code, []}; + AuthRedirect -> + % if the accept header matches html, then do the redirect. else proceed as usual. + case re:run(MochiReq:get_header_value("Accept"), "html", [{capture, none}]) of + nomatch -> + {Code, []}; + match -> + AuthRedirectBin = ?l2b(AuthRedirect), + UrlReturn = ?l2b(couch_util:url_encode(MochiReq:get(path))), + UrlReason = ?l2b(couch_util:url_encode(ReasonStr)), + {302, [{"Location", couch_httpd:absolute_uri(Req, <<AuthRedirectBin/binary,"?return=",UrlReturn/binary,"&reason=",UrlReason/binary>>)}]} + end end; _Else -> {Code, []} diff --git a/src/couchdb/couch_rep_writer.erl b/src/couchdb/couch_rep_writer.erl index 16fc1902..dd6396fd 100644 --- a/src/couchdb/couch_rep_writer.erl +++ b/src/couchdb/couch_rep_writer.erl @@ -78,7 +78,6 @@ write_bulk_docs(#http_db{headers = Headers} = Db, Docs) -> body = {[{new_edits, false}, {docs, JsonDocs}]}, headers = couch_util:proplist_apply_field({"Content-Type", "application/json"}, [{"X-Couch-Full-Commit", "false"} | Headers]) }, - ?LOG_ERROR("headers ~p",[Request#http_db.headers]), ErrorsJson = case couch_rep_httpc:request(Request) of {FailProps} -> exit({target_error, couch_util:get_value(<<"error">>, FailProps)}); |