commit cc7850c6d15125fd8e1c7e4969e4bf76a140c6b0
author Mike Wallace <mikewallace@apache.org> Tue Jun 30 21:52:58 2015 +0100
committer Mike Wallace <mikewallace@apache.org> Wed Jul 15 11:14:52 2015 +0100
tree 4ee3cca8288c15d5ee987d9d34e017666516ac6c
parent 13fed1ed28976aa1ed3fc92d30336ea53d837894

Allow couch_index to open restricted design docs

Design docs in the authentication DB cannot be opened without an
admin context so this commit teaches couch_index to always use
?ADMIN_CTX when opening documents.

COUCHDB-2738

This closes #6

src/couch_index.erl

diff --git a/src/couch_index.erl b/src/couch_index.erl
index a554c0e..fa08dd1 100644
--- a/src/couch_index.erl
+++ b/src/couch_index.erl
@@ -283,7 +283,7 @@
     DbName = Mod:get(db_name, IdxState),
     DDocId = Mod:get(idx_name, IdxState),
     Shutdown = couch_util:with_db(DbName, fun(Db) ->
-        case couch_db:open_doc(Db, DDocId, [ejson_body]) of
+        case couch_db:open_doc(Db, DDocId, [ejson_body, ?ADMIN_CTX]) of
             {not_found, deleted} ->
                 true;
             {ok, DDoc} ->

src/couch_index_server.erl

diff --git a/src/couch_index_server.erl b/src/couch_index_server.erl
index 4b60a39..42a122b 100644
--- a/src/couch_index_server.erl
+++ b/src/couch_index_server.erl
@@ -73,7 +73,7 @@
     end;
 get_index(Module, <<"shards/", _/binary>> = DbName, DDoc) ->
     {Pid, Ref} = spawn_monitor(fun() ->
-        exit(fabric:open_doc(mem3:dbname(DbName), DDoc, [ejson_body]))
+        exit(fabric:open_doc(mem3:dbname(DbName), DDoc, [ejson_body, ?ADMIN_CTX]))
     end),
     receive {'DOWN', Ref, process, Pid, {ok, Doc}} ->
         get_index(Module, DbName, Doc, nil);
@@ -93,7 +93,7 @@
         get_index(Module, Db, DDoc, Fun)
     end);
 get_index(Module, Db, DDoc, Fun) when is_binary(DDoc) ->
-    case couch_db:open_doc(Db, DDoc, [ejson_body]) of
+    case couch_db:open_doc(Db, DDoc, [ejson_body, ?ADMIN_CTX]) of
         {ok, Doc} -> get_index(Module, Db, Doc, Fun);
         Error -> Error
     end;