nickva closed pull request #1631: Do not crash replicator on VDU function
failure
URL: https://github.com/apache/couchdb/pull/1631
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/couch_replicator/src/couch_replicator_docs.erl
b/src/couch_replicator/src/couch_replicator_docs.erl
index 62d21fe126..0134756830 100644
--- a/src/couch_replicator/src/couch_replicator_docs.erl
+++ b/src/couch_replicator/src/couch_replicator_docs.erl
@@ -366,6 +366,14 @@ save_rep_doc(DbName, Doc) ->
{ok, Db} = couch_db:open_int(DbName, [?CTX, sys_db]),
try
couch_db:update_doc(Db, Doc, [])
+ catch
+ % User can accidently write a VDU which prevents _replicator from
+ % updating replication documents. Avoid crashing replicator and thus
+ % preventing all other replication jobs on the node from running.
+ throw:{forbidden, Reason} ->
+ Msg = "~p VDU function preventing doc update to ~s ~s ~p",
+ couch_log:error(Msg, [?MODULE, DbName, Doc#doc.id, Reason]),
+ {ok, forbidden}
after
couch_db:close(Db)
end.
@@ -694,7 +702,9 @@ error_reason(Reason) ->
-ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
+
+-include_lib("couch/include/couch_eunit.hrl").
+
check_options_pass_values_test() ->
?assertEqual(check_options([]), []),
@@ -766,4 +776,50 @@ check_strip_credentials_test() ->
}
]].
+
+setup() ->
+ DbName = ?tempdb(),
+ {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]),
+ ok = couch_db:close(Db),
+ create_vdu(DbName),
+ DbName.
+
+
+teardown(DbName) when is_binary(DbName) ->
+ couch_server:delete(DbName, [?ADMIN_CTX]),
+ ok.
+
+
+create_vdu(DbName) ->
+ couch_util:with_db(DbName, fun(Db) ->
+ VduFun = <<"function(newdoc, olddoc, userctx)
{throw({'forbidden':'fail'})}">>,
+ Doc = #doc{
+ id = <<"_design/vdu">>,
+ body = {[{<<"validate_doc_update">>, VduFun}]}
+ },
+ {ok, _} = couch_db:update_docs(Db, [Doc]),
+ couch_db:ensure_full_commit(Db)
+ end).
+
+
+update_replicator_doc_with_bad_vdu_test_() ->
+ {
+ setup,
+ fun test_util:start_couch/0,
+ fun test_util:stop_couch/1,
+ {
+ foreach, fun setup/0, fun teardown/1,
+ [
+ fun t_vdu_does_not_crash_on_save/1
+ ]
+ }
+ }.
+
+
+t_vdu_does_not_crash_on_save(DbName) ->
+ ?_test(begin
+ Doc = #doc{id = <<"some_id">>, body = {[{<<"foo">>, 42}]}},
+ ?assertEqual({ok, forbidden}, save_rep_doc(DbName, Doc))
+ end).
+
-endif.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
