Merge branch 'test' into dev

apps/wiggle/src/wiggle_dataset_handler.erl

@@ -290,8 +290,8 @@ do_write(UUID, Idx, Data, WReq, Retry) ->
         {ok, WReq1} ->
             {ok, WReq1};
         Reason ->
-            lager:warning("[~s:~p] Import Error: ~p",
-                         [UUID, Retry, Reason]),
+            lager:warning("[~s(~p):~p] Import Error: ~p",
+                         [UUID, Idx, Retry, Reason]),
             do_write(UUID, Idx, Data, WReq, Retry + 1)
     end.
 

apps/wiggle/src/wiggle_user_handler.erl

@@ -288,11 +288,17 @@ write(Req, State = #state{path = [User, <<"metadata">> | Path]}, [{K, V}]) ->
 
 write(Req, State = #state{path = [User, <<"keys">>]}, [{KeyID, Key}]) ->
     case re:split(Key, " ") of
-        [_,_,_] ->
-            Start = now(),
-            libsnarl:user_key_add(User, KeyID, Key),
-            ?MSnarl(?P(State), Start),
-            {true, Req, State};
+        [_,ID,_] ->
+            try
+                base64:decode(ID),
+                Start = now(),
+                libsnarl:user_key_add(User, KeyID, Key),
+                ?MSnarl(?P(State), Start),
+                {true, Req, State}
+            catch
+                _:_ ->
+                    {false, Req, State}
+            end;
         _ ->
             {false, Req, State}
     end;

apps/wiggle/src/wiggle_vm_handler.erl

@@ -277,7 +277,8 @@ read(Req, State = #state{path = [_Vm, <<"backups">>, Snap], obj = Obj}) ->
             {jsxd:set(<<"uuid">>, Snap, SnapObj), Req, State}
     end;
 
-read(Req, State = #state{path = [_Vm, <<"services">>, Snap], obj = Obj}) ->
+read(Req, State = #state{path = [_Vm, <<"services">>, Snap],
+                         obj = Obj = [{_,_}|_]}) when is_binary(Snap) ->
     {jsxd:get([<<"services">>, Snap], [{}], Obj), Req, State};
 
 read(Req, State = #state{path = [_Vm], obj = Obj}) ->

dialyzer.mittigate

@@ -9,3 +9,9 @@
 ^glc_code.erl:
 ^lager.erl
 ^msgpack.erl:185
+^conf_parse.erl
+^cuttlefish_escript.erl
+^mdns_client_lib_worker.erl:97
+^neotoma
+^uuid.erl:96:
+^uuid.erl:110:

rebar.config

@@ -22,7 +22,7 @@
   {statman, ".*", {git, "https://github.com/Licenser/statman.git", {tag, "master"}}},
   {jsxd, ".*", {git, "https://github.com/Licenser/jsxd.git", {tag, "0.1.6"}}},
   {ensq, ".*", {git, "git://github.com/project-fifo/ensq.git", {branch, master}}},
-  {ensq_rpc, ".*", {git, "git://github.com/project-fifo/ensq_rpc.git", {tag, "0.1.0"}}},
+  {ensq_rpc, ".*", {git, "git://github.com/project-fifo/ensq_rpc.git", {branch, master}}},
   {uuid, ".*", {git, "https://github.com/project-fifo/erlang-uuid.git", {branch, "master"}}},
   {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {tag, "0.1.3"}}},
   {libchunter, ".*", {git, "http://github.com/project-fifo/libchunter.git", {tag, "0.1.24"}}},