yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: support --auth-chains merge|replace mod

This commit is contained in:
zhongwencool 2023-06-09 12:55:28 +08:00
parent 21ffd958b4
commit b829d8edc2
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_authz/src/emqx_authz.erl
View File

@ -41,7 +41,6 @@
-export([post_config_update/5, pre_config_update/3]). -export([post_config_update/5, pre_config_update/3]).
-export([acl_conf_file/0]). -export([acl_conf_file/0]).
-export([merge_sources/2, search/2]).
%% Data backup %% Data backup
-export([ -export([

35
apps/emqx_conf/src/emqx_conf_cli.erl
View File

@ -16,6 +16,9 @@
-module(emqx_conf_cli). -module(emqx_conf_cli).
-include("emqx_conf.hrl"). -include("emqx_conf.hrl").
-include_lib("emqx/include/emqx_access_control.hrl").
-include_lib("emqx/include/emqx_authentication.hrl").
-export([ -export([
load/0, load/0,
admins/1, admins/1,
@ -43,8 +46,12 @@ conf(["show"]) ->
print_hocon(get_config()); print_hocon(get_config());
conf(["show", Key]) -> conf(["show", Key]) ->
print_hocon(get_config(Key)); print_hocon(get_config(Key));
conf(["load", "--auth-chains", AuthChains, Path]) when
AuthChains =:= "replace"; AuthChains =:= "merge"
->
load_config(Path, AuthChains);
conf(["load", Path]) -> conf(["load", Path]) ->
load_config(Path); load_config(Path, "replace");
conf(["cluster_sync" | Args]) -> conf(["cluster_sync" | Args]) ->
admins(Args); admins(Args);
conf(["reload"]) -> conf(["reload"]) ->
@ -169,13 +176,13 @@ hidden_roots() ->
). ).
get_config(Key) -> get_config(Key) ->
case emqx:get_raw_config(Key, undefined) of case emqx:get_raw_config([Key], undefined) of
undefined -> {error, "key_not_found"}; undefined -> {error, "key_not_found"};
Value -> emqx_config:fill_defaults(#{Key => Value}) Value -> emqx_config:fill_defaults(#{Key => Value})
end. end.
-define(OPTIONS, #{rawconf_with_defaults => true, override_to => cluster}). -define(OPTIONS, #{rawconf_with_defaults => true, override_to => cluster}).
load_config(Path) -> load_config(Path, AuthChain) ->
case hocon:files([Path]) of case hocon:files([Path]) of
{ok, RawConf} when RawConf =:= #{} -> {ok, RawConf} when RawConf =:= #{} ->
emqx_ctl:warning("load ~ts is empty~n", [Path]), emqx_ctl:warning("load ~ts is empty~n", [Path]),
@ -183,7 +190,7 @@ load_config(Path) ->
{ok, RawConf} -> {ok, RawConf} ->
case check_config_keys(RawConf) of case check_config_keys(RawConf) of
ok -> ok ->
maps:foreach(fun update_config/2, RawConf); maps:foreach(fun(K, V) -> update_config(K, V, AuthChain) end, RawConf);
{error, Reason} -> {error, Reason} ->
emqx_ctl:warning("load ~ts failed~n~ts~n", [Path, Reason]), emqx_ctl:warning("load ~ts failed~n~ts~n", [Path, Reason]),
emqx_ctl:warning( emqx_ctl:warning(
@ -196,13 +203,19 @@ load_config(Path) ->
{error, bad_hocon_file} {error, bad_hocon_file}
end. end.
update_config(Key, Value) -> update_config(?EMQX_AUTHORIZATION_CONFIG_ROOT_NAME = Key, Conf, "merge") ->
case emqx_conf:update([Key], Value, ?OPTIONS) of Res = emqx_authz:merge(Conf),
{ok, _} -> check_res(Key, Res);
emqx_ctl:print("load ~ts in cluster ok~n", [Key]); update_config(?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME = Key, Conf, "merge") ->
{error, Reason} -> Res = emqx_authn:merge_config(Conf),
emqx_ctl:warning("load ~ts failed~n~p~n", [Key, Reason]) check_res(Key, Res);
end. update_config(Key, Value, _) ->
Res = emqx_conf:update([Key], Value, ?OPTIONS),
check_res(Key, Res).
check_res(Key, {ok, _}) -> emqx_ctl:print("load ~ts in cluster ok~n", [Key]);
check_res(Key, {error, Reason}) -> emqx_ctl:warning("load ~ts failed~n~p~n", [Key, Reason]).
check_config_keys(Conf) -> check_config_keys(Conf) ->
Keys = maps:keys(Conf), Keys = maps:keys(Conf),
ReadOnlyKeys = [atom_to_binary(K) || K <- ?READONLY_KEYS], ReadOnlyKeys = [atom_to_binary(K) || K <- ?READONLY_KEYS],