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

chore: fix duplicated variable name

This commit is contained in:
JianBo He 2022-10-09 17:43:30 +08:00
parent e5a673376f
commit 68dd29420d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_auth_http/src/emqx_acl_http.erl
View File

@ -56,14 +56,14 @@ description() -> "ACL with HTTP API".
%% Internal functions %% Internal functions
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
check_acl_request(Params = check_acl_request(ACLParams =
#{pool_name := PoolName, #{pool_name := PoolName,
path := Path, path := Path,
method := Method, method := Method,
headers := Headers, headers := Headers,
params := Params, params := Params,
timeout := Timeout}, ClientInfo) -> timeout := Timeout}, ClientInfo) ->
Retry = maps:get(retry_times, Params, ?DEFAULT_RETRY_TIMES), Retry = maps:get(retry_times, ACLParams, ?DEFAULT_RETRY_TIMES),
request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry). request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry).
access(subscribe) -> 1; access(subscribe) -> 1;

2
apps/emqx_auth_http/src/emqx_auth_http.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_auth_http, {application, emqx_auth_http,
[{description, "EMQ X Authentication/ACL with HTTP API"}, [{description, "EMQ X Authentication/ACL with HTTP API"},
{vsn, "4.3.7"}, % strict semver, bump manually! {vsn, "4.3.8"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_http_sup]}, {registered, [emqx_auth_http_sup]},
{applications, [kernel,stdlib,ehttpc]}, {applications, [kernel,stdlib,ehttpc]},

8
apps/emqx_auth_http/src/emqx_auth_http.erl
View File

@ -63,27 +63,27 @@ description() -> "Authentication by HTTP API".
%% Requests %% Requests
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
authenticate(Params = authenticate(AuthParams =
#{pool_name := PoolName, #{pool_name := PoolName,
path := Path, path := Path,
method := Method, method := Method,
headers := Headers, headers := Headers,
params := Params, params := Params,
timeout := Timeout}, ClientInfo) -> timeout := Timeout}, ClientInfo) ->
Retry = maps:get(retry_times, Params, ?DEFAULT_RETRY_TIMES), Retry = maps:get(retry_times, AuthParams, ?DEFAULT_RETRY_TIMES),
request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry). request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry).
-spec(is_superuser(maybe(map()), emqx_types:client()) -> boolean()). -spec(is_superuser(maybe(map()), emqx_types:client()) -> boolean()).
is_superuser(undefined, _ClientInfo) -> is_superuser(undefined, _ClientInfo) ->
false; false;
is_superuser(Params = is_superuser(SuperParams =
#{pool_name := PoolName, #{pool_name := PoolName,
path := Path, path := Path,
method := Method, method := Method,
headers := Headers, headers := Headers,
params := Params, params := Params,
timeout := Timeout}, ClientInfo) -> timeout := Timeout}, ClientInfo) ->
Retry = maps:get(retry_times, Params, ?DEFAULT_RETRY_TIMES), Retry = maps:get(retry_times, SuperParams, ?DEFAULT_RETRY_TIMES),
case request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry) of case request(PoolName, Method, Path, Headers, feedvar(Params, ClientInfo), Timeout, Retry) of
{ok, 200, _Body} -> true; {ok, 200, _Body} -> true;
{ok, _Code, _Body} -> false; {ok, _Code, _Body} -> false;

2
apps/emqx_auth_http/src/emqx_auth_http_cli.erl
View File

@ -29,7 +29,7 @@
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
request(PoolName, Method, Path, Headers, Params, Timeout) -> request(PoolName, Method, Path, Headers, Params, Timeout) ->
request(PoolName, Method, Path, Headers, Params, ?DEFAULT_RETRY_TIMES). request(PoolName, Method, Path, Headers, Params, Timeout, ?DEFAULT_RETRY_TIMES).
request(PoolName, get, Path, Headers, Params, Timeout, Retry) -> request(PoolName, get, Path, Headers, Params, Timeout, Retry) ->
NewPath = Path ++ "?" ++ binary_to_list(cow_qs:qs(bin_kw(Params))), NewPath = Path ++ "?" ++ binary_to_list(cow_qs:qs(bin_kw(Params))),

2
apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl
View File

@ -408,7 +408,7 @@ t_password_hash(_) ->
ok = application:start(emqx_auth_mnesia). ok = application:start(emqx_auth_mnesia).
t_will_message_connection_denied(Config) when is_list(Config) -> t_will_message_connection_denied(Config) when is_list(Config) ->
ClientId = Username = <<"subscriber">>, ClientId = <<"subscriber">>,
Password = <<"p">>, Password = <<"p">>,
application:stop(emqx_auth_mnesia), application:stop(emqx_auth_mnesia),
ok = emqx_ct_helpers:start_apps([emqx_auth_mnesia]), ok = emqx_ct_helpers:start_apps([emqx_auth_mnesia]),