couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to 3ff69bf
Date Sun, 20 Dec 2015 18:23:52 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master d7e1e0ab1 -> 3ff69bffd


Create _design/_auth if missing in clustered users db

This also fixes a crash if the _users db had any design documents in it.

COUCHDB-2082


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/3ff69bff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/3ff69bff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/3ff69bff

Branch: refs/heads/master
Commit: 3ff69bffd45cda6b256bf73cbf7799798c0b4917
Parents: d7e1e0a
Author: Robert Newson <rnewson@apache.org>
Authored: Sun Dec 20 18:15:21 2015 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Dec 20 18:23:43 2015 +0000

----------------------------------------------------------------------
 src/chttpd_auth_cache.erl | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/3ff69bff/src/chttpd_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_auth_cache.erl b/src/chttpd_auth_cache.erl
index 6e39e5a..74ee77d 100644
--- a/src/chttpd_auth_cache.erl
+++ b/src/chttpd_auth_cache.erl
@@ -19,6 +19,7 @@
 -export([listen_for_changes/1, changes_callback/2]).
 
 -include_lib("couch/include/couch_db.hrl").
+-include_lib("couch/include/couch_js_functions.hrl").
 
 -define(CACHE, chttpd_auth_cache_lru).
 
@@ -113,6 +114,7 @@ handle_info({'DOWN', _, _, Pid, Reason}, #state{changes_pid=Pid} = State)
->
     erlang:send_after(5000, self(), {start_listener, Seq}),
     {noreply, State#state{last_seq=Seq}};
 handle_info({start_listener, Seq}, State) ->
+    ensure_auth_ddoc_exists(dbname(), <<"_design/_auth">>),
     {noreply, State#state{changes_pid = spawn_changes(Seq)}};
 handle_info(_Msg, State) ->
     {noreply, State}.
@@ -146,9 +148,14 @@ changes_callback(start, Since) ->
 changes_callback({stop, EndSeq, _Pending}, _) ->
     exit({seq, EndSeq});
 changes_callback({change, {Change}}, _) ->
-    UserName = username(couch_util:get_value(id, Change)),
-    couch_log:debug("Invalidating cached credentials for ~s", [UserName]),
-    ets_lru:remove(?CACHE, UserName),
+    case couch_util:get_value(id, Change) of
+        <<"_design/", _/binary>> ->
+            ok;
+        DocId ->
+            UserName = username(DocId),
+            couch_log:debug("Invalidating cached credentials for ~s", [UserName]),
+            ets_lru:remove(?CACHE, UserName)
+    end,
     {ok, couch_util:get_value(seq, Change)};
 changes_callback(timeout, EndSeq) ->
     exit({seq, EndSeq});
@@ -175,3 +182,30 @@ docid(UserName) ->
 
 username(<<"org.couchdb.user:", UserName/binary>>) ->
     UserName.
+
+ensure_auth_ddoc_exists(DbName, DDocId) ->
+    case fabric:open_doc(DbName, DDocId, [?ADMIN_CTX, ejson_body]) of
+    {not_found, _Reason} ->
+        {ok, AuthDesign} = couch_auth_cache:auth_design_doc(DDocId),
+        update_doc_ignoring_conflict(DbName, AuthDesign, [?ADMIN_CTX]);
+    {ok, Doc} ->
+        {Props} = couch_doc:to_json_obj(Doc, []),
+        case couch_util:get_value(<<"validate_doc_update">>, Props, []) of
+            ?AUTH_DB_DOC_VALIDATE_FUNCTION ->
+                ok;
+            _ ->
+                Props1 = lists:keyreplace(<<"validate_doc_update">>, 1, Props,
+                    {<<"validate_doc_update">>,
+                    ?AUTH_DB_DOC_VALIDATE_FUNCTION}),
+                update_doc_ignoring_conflict(DbName, couch_doc:from_json_obj({Props1}), [?ADMIN_CTX])
+        end
+    end,
+    ok.
+
+update_doc_ignoring_conflict(DbName, Doc, Options) ->
+    try
+        fabric:update_doc(DbName, Doc, Options)
+    catch
+        error:conflict ->
+            ok
+    end.


Mime
View raw message