Nearly completed security/validation work. Still needs replication testing.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@719160 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 6 deletions

diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl
index 141c9406..8465a632 100644
--- a/src/couchdb/couch_query_servers.erl
+++ b/src/couchdb/couch_query_servers.erl
@@ -69,9 +69,9 @@ prompt(Port, Json) ->
     true = port_command(Port, Bin),
     case read_json(Port) of
     {[{<<"error">>, Id}, {<<"reason">>, Reason}]} ->
-        throw({list_to_atom(binary_to_list(Id)),Reason});
+        throw({Id,Reason});
     {[{<<"reason">>, Reason}, {<<"error">>, Id}]} ->
-        throw({list_to_atom(binary_to_list(Id)),Reason});
+        throw({Id,Reason});
     Result ->
         Result
     end.
@@ -181,15 +181,16 @@ validate_doc_update(Lang, FunSrc, EditDoc, DiskDoc, Ctx) ->
     if DiskDoc == nil ->
         null;
     true -> 
-        couch_doc:to_json_obj(EditDoc, [revs])
+        couch_doc:to_json_obj(DiskDoc, [revs])
     end,
     try prompt(Port, 
             [<<"validate">>, FunSrc, JsonEditDoc, JsonDiskDoc, Ctx]) of
     1 ->
         ok;
-    {ErrorObject} ->
-        {user_error,
-           {ErrorObject}}
+    {[{<<"forbidden">>, Message}]} ->
+        throw({forbidden, Message});
+    {[{<<"unauthorized">>, Message}]} ->
+        throw({unauthorized, Message})
     after
         return_linked_port(Lang, Port)
     end.