Add logs for malformed acl configuration file

This commit is contained in:
周子博 2018-12-03 13:57:37 +08:00
parent 95446ca837
commit b2c3d8366d
2 changed files with 25 additions and 13 deletions

View File

@ -34,16 +34,20 @@
-export([match/3]). -export([match/3]).
-define(ALLOW_DENY(A), ((A =:= allow) orelse (A =:= deny))). -define(ALLOW_DENY(A), ((A =:= allow) orelse (A =:= deny))).
-define(PUBSUB(A), ((A =:= subscribe) orelse (A =:= publish) orelse (A =:= pubsub))).
%% @doc Compile Access Rule. %% @doc Compile Access Rule.
compile({A, all}) when ?ALLOW_DENY(A) -> compile({A, all}) when ?ALLOW_DENY(A) ->
{A, all}; {A, all};
compile({A, Who, Access, Topic}) when ?ALLOW_DENY(A), is_binary(Topic) -> compile({A, Who, Access, Topic}) when ?ALLOW_DENY(A), ?PUBSUB(Access), is_binary(Topic) ->
{A, compile(who, Who), Access, [compile(topic, Topic)]}; {A, compile(who, Who), Access, [compile(topic, Topic)]};
compile({A, Who, Access, TopicFilters}) when ?ALLOW_DENY(A) -> compile({A, Who, Access, TopicFilters}) when ?ALLOW_DENY(A), ?PUBSUB(Access) ->
{A, compile(who, Who), Access, [compile(topic, Topic) || Topic <- TopicFilters]}. {A, compile(who, Who), Access, [compile(topic, Topic) || Topic <- TopicFilters]};
compile(Rule) ->
emqx_logger:error("[ACCESS_RULE] Malformed rule: ~p", [Rule]).
compile(who, all) -> compile(who, all) ->
all; all;

View File

@ -46,17 +46,23 @@ all_rules() ->
-spec(init([File :: string()]) -> {ok, #{}}). -spec(init([File :: string()]) -> {ok, #{}}).
init([File]) -> init([File]) ->
_ = emqx_tables:new(?ACL_RULE_TAB, [set, public, {read_concurrency, true}]), _ = emqx_tables:new(?ACL_RULE_TAB, [set, public, {read_concurrency, true}]),
true = load_rules_from_file(File), ok = load_rules_from_file(File),
{ok, #{acl_file => File}}. {ok, #{acl_file => File}}.
load_rules_from_file(AclFile) -> load_rules_from_file(AclFile) ->
{ok, Terms} = file:consult(AclFile), case file:consult(AclFile) of
Rules = [emqx_access_rule:compile(Term) || Term <- Terms], {ok, Terms} ->
lists:foreach(fun(PubSub) -> Rules = [emqx_access_rule:compile(Term) || Term <- Terms],
ets:insert(?ACL_RULE_TAB, {PubSub, lists:foreach(fun(PubSub) ->
lists:filter(fun(Rule) -> filter(PubSub, Rule) end, Rules)}) ets:insert(?ACL_RULE_TAB, {PubSub,
end, [publish, subscribe]), lists:filter(fun(Rule) -> filter(PubSub, Rule) end, Rules)})
ets:insert(?ACL_RULE_TAB, {all_rules, Terms}). end, [publish, subscribe]),
ets:insert(?ACL_RULE_TAB, {all_rules, Terms}),
ok;
{error, Reason} ->
emqx_logger:error("[ACL_INTERNAL] Consult failed: ~p", [Reason]),
{error, Reason}
end.
filter(_PubSub, {allow, all}) -> filter(_PubSub, {allow, all}) ->
true; true;
@ -100,9 +106,11 @@ match(Credentials, Topic, [Rule|Rules]) ->
-spec(reload_acl(state()) -> ok | {error, term()}). -spec(reload_acl(state()) -> ok | {error, term()}).
reload_acl(#{acl_file := AclFile}) -> reload_acl(#{acl_file := AclFile}) ->
case catch load_rules_from_file(AclFile) of case catch load_rules_from_file(AclFile) of
true -> ok ->
emqx_logger:info("Reload acl_file ~s successfully", [AclFile]), emqx_logger:info("Reload acl_file ~s successfully", [AclFile]),
ok; ok;
{error, Error} ->
{error, Error};
{'EXIT', Error} -> {'EXIT', Error} ->
{error, Error} {error, Error}
end. end.