From da3a56dd74999ccb35985062ba2966afc20fc740 Mon Sep 17 00:00:00 2001
From: Scott Lystig Fritchie <slfritchie@snookles.com>
Date: Wed, 1 Jul 2015 17:57:23 +0900
Subject: [PATCH] Fix epoch checking in eunit tests and enforcement by FLU
 (always permit list_files())

---
 src/machi_flu1.erl           | 12 ++++++------
 test/machi_flu_psup_test.erl |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/machi_flu1.erl b/src/machi_flu1.erl
index 2e70005..ccf0f3a 100644
--- a/src/machi_flu1.erl
+++ b/src/machi_flu1.erl
@@ -342,12 +342,11 @@ do_pb_ll_request(PB_request, S) ->
     Req = machi_pb_translate:from_pb_request(PB_request),
     {ReqID, Cmd, Result, S2} = 
         case Req of
-            {RqID, {low_proj, _}=CMD} ->
+            {RqID, {LowCmd, _}=CMD}
+              when LowCmd == low_proj;
+                   LowCmd == low_wedge_status; LowCmd == low_list_files ->
                 %% Skip wedge check for projection commands!
-                {Rs, NewS} = do_pb_ll_request3(CMD, S),
-                {RqID, CMD, Rs, NewS};
-            {RqID, {low_wedge_status, _}=CMD} ->
-                %% Skip wedge check for low_wedge_status!
+                %% Skip wedge check for these unprivileged commands
                 {Rs, NewS} = do_pb_ll_request3(CMD, S),
                 {RqID, CMD, Rs, NewS};
             {RqID, CMD} ->
@@ -361,7 +360,7 @@ do_pb_ll_request2(EpochID, CMD, S) ->
     {Wedged_p, CurrentEpochID} = ets:lookup_element(S#state.etstab, epoch, 2),
     if Wedged_p == true ->
             {{error, wedged}, S};
-       not ((not is_tuple(EpochID)) orelse EpochID == ?DUMMY_PV1_EPOCH)
+       is_tuple(EpochID)
        andalso
        EpochID /= CurrentEpochID ->
             {Epoch, _} = EpochID,
@@ -946,6 +945,7 @@ encode_csum_file_entry_bin(Offset, Size, TaggedCSum) ->
 %% `?CSUM_TAG_NONE'.
 
 -spec decode_csum_file_entry(binary()) ->
+        error |
         {machi_dt:file_offset(), machi_dt:chunk_size(), machi_dt:chunk_s()}.
 decode_csum_file_entry(<<_:8/unsigned-big, Offset:64/unsigned-big, Size:32/unsigned-big, TaggedCSum/binary>>) ->
     {Offset, Size, TaggedCSum};
diff --git a/test/machi_flu_psup_test.erl b/test/machi_flu_psup_test.erl
index 8d05b9d..a406bdd 100644
--- a/test/machi_flu_psup_test.erl
+++ b/test/machi_flu_psup_test.erl
@@ -147,7 +147,8 @@ partial_stop_restart2() ->
                             <<>>, 99999999, 1),
         {error, wedged} = machi_flu1_client:checksum_list(
                             Addr_a, TcpPort_a, ?DUMMY_PV1_EPOCH, <<>>),
-        {error, wedged} = machi_flu1_client:list_files(
+        %% list_files() is permitted despite wedged status
+        {ok, _} = machi_flu1_client:list_files(
                             Addr_a, TcpPort_a, ?DUMMY_PV1_EPOCH),
 
         %% Iterate through humming consensus once