fix(auth mnesia api): fix api error for file type

.github/workflows/run_api_tests.yaml

@@ -2,9 +2,9 @@ name: API Test Suite
 
 on:
   push:
-   tags:
+    tags:
-     - e*
+      - e*
-     - v*
+      - v*
   pull_request:
 
 jobs:

apps/emqx_authz/src/emqx_authz.erl

@@ -87,15 +87,19 @@ pre_config_update({move, Type, <<"top">>}, Conf) when is_list(Conf) ->
     {Index, _} = find_source_by_type(Type),
     {List1, List2} = lists:split(Index, Conf),
     NConf = [lists:nth(Index, Conf)] ++ lists:droplast(List1) ++ List2,
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 
 pre_config_update({move, Type, <<"bottom">>}, Conf) when is_list(Conf) ->
     {Index, _} = find_source_by_type(Type),
     {List1, List2} = lists:split(Index, Conf),
     NConf = lists:droplast(List1) ++ List2 ++ [lists:nth(Index, Conf)],
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 
 pre_config_update({move, Type, #{<<"before">> := Before}}, Conf) when is_list(Conf) ->
     {Index1, _} = find_source_by_type(Type),
@@ -107,8 +111,10 @@ pre_config_update({move, Type, #{<<"before">> := Before}}, Conf) when is_list(Co
     NConf = lists:delete(Conf1, lists:droplast(List1))
          ++ [Conf1] ++ [Conf2]
          ++ lists:delete(Conf1, List2),
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 
 pre_config_update({move, Type, #{<<"after">> := After}}, Conf) when is_list(Conf) ->
     {Index1, _} = find_source_by_type(Type),
@@ -119,28 +125,38 @@ pre_config_update({move, Type, #{<<"after">> := After}}, Conf) when is_list(Conf
     NConf = lists:delete(Conf1, List1)
          ++ [Conf1]
          ++ lists:delete(Conf1, List2),
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 
 pre_config_update({head, Sources}, Conf) when is_list(Sources), is_list(Conf) ->
     NConf = Sources ++ Conf,
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, Sources ++ Conf};
+        ok -> {ok, Sources ++ Conf};
+        Error -> Error
+    end;
 pre_config_update({tail, Sources}, Conf) when is_list(Sources), is_list(Conf) ->
     NConf = Conf ++ Sources,
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, Conf ++ Sources};
+        ok -> {ok, Conf ++ Sources};
+        Error -> Error
+    end;
 pre_config_update({{replace_once, Type}, Source}, Conf) when is_map(Source), is_list(Conf) ->
     {Index, _} = find_source_by_type(Type),
     {List1, List2} = lists:split(Index, Conf),
     NConf = lists:droplast(List1) ++ [Source] ++ List2,
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 pre_config_update({{delete_once, Type}, _Source}, Conf) when is_list(Conf) ->
     {_, Source} = find_source_by_type(Type),
     NConf = lists:delete(Source, Conf),
-    ok = check_dup_types(NConf),
+    case check_dup_types(NConf) of
-    {ok, NConf};
+        ok -> {ok, NConf};
+        Error -> Error
+    end;
 pre_config_update({_, Sources}, _Conf) when is_list(Sources)->
     %% overwrite the entire config!
     {ok, Sources}.
@@ -249,7 +265,7 @@ check_dup_types(Sources, [T0 | Tail]) ->
                      end, 0, Sources) > 1 of
         true ->
            ?LOG(error, "The type is duplicated in the Authorization source"),
-           {error, authz_source_dup};
+           {error, 'The type is duplicated in the Authorization source'};
         false -> check_dup_types(Sources, Tail)
     end.
 

apps/emqx_authz/src/emqx_authz_api_sources.erl

@@ -298,12 +298,20 @@ move_source_api() ->
 
 sources(get, _) ->
     Sources = lists:foldl(fun (#{type := file, enable := Enable, path := Path}, AccIn) ->
-                                  {ok, Rules} = file:consult(Path),
+                                  case file:consult(Path) of
-                                  lists:append(AccIn, [#{type => file,
+                                      {ok, Rules} ->
-                                                         enable => Enable,
+                                          lists:append(AccIn, [#{type => file,
-                                                         rules => [ iolist_to_binary(io_lib:format("~p.", [R])) || R <- Rules],
+                                                                 enable => Enable,
-                                                         annotations => #{status => healthy}
+                                                                 rules => iolist_to_binary([io_lib:format("~p.", [R]) || R <- Rules]),
-                                                        }]);
+                                                                 annotations => #{status => healthy}
+                                                                }]);
+                                      {error, _} ->
+                                          lists:append(AccIn, [#{type => file,
+                                                                 enable => Enable,
+                                                                 rules => <<"">>,
+                                                                 annotations => #{status => unhealthy}
+                                                                }])
+                                  end;
                               (#{enable := false} = Source, AccIn) ->
                                   lists:append(AccIn, [Source#{annotations => #{status => unhealthy}}]);
                               (#{type := _Type, annotations := #{id := Id}} = Source, AccIn) ->
@@ -328,23 +336,14 @@ sources(get, _) ->
                                   lists:append(AccIn, [Source#{annotations => #{status => healthy}}])
                         end, [], emqx_authz:lookup()),
     {200, #{sources => Sources}};
-sources(post, #{body := #{<<"type">> := <<"file">>, <<"rules">> := Rules, <<"enable">> := Enable}}) when is_list(Rules) ->
+sources(post, #{body := #{<<"type">> := <<"file">>, <<"rules">> := Rules}}) when is_list(Rules) ->
     {ok, Filename} = write_file(filename:join([emqx:get_config([node, data_dir]), "acl.conf"]),
                                 erlang:list_to_bitstring([<<Rule/binary, "\n">> || Rule <- Rules])
                                ),
-    case emqx_authz:update(head, [#{type => file, enable => Enable, path => Filename}]) of
+
-        {ok, _} -> {204};
+    update_config(head, [#{type => file, enable => true, path => Filename}]);
-        {error, Reason} ->
-            {400, #{code => <<"BAD_REQUEST">>,
-                    messgae => atom_to_binary(Reason)}}
-    end;
 sources(post, #{body := Body}) when is_map(Body) ->
-    case emqx_authz:update(head, [write_cert(Body)]) of
+    update_config(head, [write_cert(Body)]);
-        {ok, _} -> {204};
-        {error, Reason} ->
-            {400, #{code => <<"BAD_REQUEST">>,
-                    messgae => atom_to_binary(Reason)}}
-    end;
 sources(put, #{body := Body}) when is_list(Body) ->
     NBody = [ begin
                 case Source of
@@ -354,24 +353,24 @@ sources(put, #{body := Body}) when is_list(Body) ->
                     _ -> write_cert(Source)
                 end
               end || Source <- Body],
-    case emqx_authz:update(replace, NBody) of
+    update_config(replace, NBody).
-        {ok, _} -> {204};
-        {error, Reason} ->
-            {400, #{code => <<"BAD_REQUEST">>,
-                    messgae => atom_to_binary(Reason)}}
-    end.
 
 source(get, #{bindings := #{type := Type}}) ->
     case emqx_authz:lookup(Type) of
         {error, Reason} -> {404, #{messgae => atom_to_binary(Reason)}};
         #{type := file, enable := Enable, path := Path}->
-            {ok, Rules} = file:consult(Path),
+            case file:consult(Path) of
-            {200, #{type => file,
+                {ok, Rules} ->
-                    enable => Enable,
+                    {200, #{type => file,
-                    rules => [ iolist_to_binary(io_lib:format("~p.", [R])) || R <- Rules],
+                            enable => Enable,
-                    annotations => #{status => healthy}
+                            rules => iolist_to_binary([io_lib:format("~p.", [R]) || R <- Rules]),
-                   }
+                            annotations => #{status => healthy}
-            };
+                           }
+                    };
+                {error, Reason} ->
+                    {400, #{code => <<"BAD_REQUEST">>,
+                            messgae => atom_to_binary(Reason)}}
+            end;
         #{enable := false} = Source -> {200, Source#{annotations => #{status => unhealthy}}};
         #{annotations := #{id := Id}} = Source ->
             NSource0 = case maps:get(server, Source, undefined) of
@@ -401,22 +400,10 @@ source(put, #{bindings := #{type := <<"file">>}, body := #{<<"type">> := <<"file
                     messgae => atom_to_binary(Reason)}}
     end;
 source(put, #{bindings := #{type := Type}, body := Body}) when is_map(Body) ->
-    case emqx_authz:update({replace_once, Type}, write_cert(Body)) of
+    update_config({replace_once, Type}, write_cert(Body));
-        {ok, _} -> {204};
-        {error, not_found_source} ->
-            {404, #{code => <<"NOT_FOUND">>,
-                    messgae => <<"source ", Type/binary, " not found">>}};
-        {error, Reason} ->
-            {400, #{code => <<"BAD_REQUEST">>,
-                    messgae => atom_to_binary(Reason)}}
-    end;
 source(delete, #{bindings := #{type := Type}}) ->
-    case emqx_authz:update({delete_once, Type}, #{}) of
+    update_config({delete_once, Type}, #{}).
-        {ok, _} -> {204};
+
-        {error, Reason} ->
-            {400, #{code => <<"BAD_REQUEST">>,
-                    messgae => atom_to_binary(Reason)}}
-    end.
 move_source(post, #{bindings := #{type := Type}, body := #{<<"position">> := Position}}) ->
     case emqx_authz:move(Type, Position) of
         {ok, _} -> {204};
@@ -428,6 +415,20 @@ move_source(post, #{bindings := #{type := Type}, body := #{<<"position">> := Pos
                     messgae => atom_to_binary(Reason)}}
     end.
 
+update_config(Cmd, Sources) ->
+    case emqx_authz:update(Cmd, Sources) of
+        {ok, _} -> {204};
+        {error, {pre_config_update, emqx_authz, Reason}} ->
+            {400, #{code => <<"BAD_REQUEST">>,
+                    messgae => atom_to_binary(Reason)}};
+        {error, {post_config_update, emqx_authz, Reason}} ->
+            {400, #{code => <<"BAD_REQUEST">>,
+                    messgae => atom_to_binary(Reason)}};
+        {error, Reason} ->
+            {400, #{code => <<"BAD_REQUEST">>,
+                    messgae => atom_to_binary(Reason)}}
+    end.
+
 read_cert(#{ssl := #{enable := true} = SSL} = Source) ->
     CaCert = case file:read_file(maps:get(cacertfile, SSL, "")) of
                  {ok, CaCert0} -> CaCert0;