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

fix: api support basic auth (#5687)

This commit is contained in:
DDDHuang 2021-09-08 19:58:04 +08:00 committed by GitHub
parent b5d1ffa814
commit f87a41a54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/emqx_dashboard/src/emqx_dashboard.erl
View File

@ -127,6 +127,16 @@ listener_name(Protocol, Port) ->
authorize_appid(Req) -> authorize_appid(Req) ->
case cowboy_req:parse_header(<<"authorization">>, Req) of case cowboy_req:parse_header(<<"authorization">>, Req) of
{basic, Username, Password} ->
case emqx_dashboard_admin:check(Username, Password) of
ok ->
ok;
{error, _} ->
{401, #{<<"WWW-Authenticate">> =>
<<"Basic Realm=\"minirest-server\"">>},
#{code => <<"ERROR_USERNAME_OR_PWD">>,
message => <<"Check your username and password">>}}
end;
{bearer, Token} -> {bearer, Token} ->
case emqx_dashboard_admin:verify_token(Token) of case emqx_dashboard_admin:verify_token(Token) of
ok -> ok ->
@ -135,8 +145,7 @@ authorize_appid(Req) ->
{401, #{<<"WWW-Authenticate">> => {401, #{<<"WWW-Authenticate">> =>
<<"Bearer Realm=\"minirest-server\"">>}, <<"Bearer Realm=\"minirest-server\"">>},
#{code => <<"TOKEN_TIME_OUT">>, #{code => <<"TOKEN_TIME_OUT">>,
message => <<"POST '/login', get your new token">>} message => <<"POST '/login', get your new token">>}};
};
{error, not_found} -> {error, not_found} ->
{401, #{<<"WWW-Authenticate">> => {401, #{<<"WWW-Authenticate">> =>
<<"Bearer Realm=\"minirest-server\"">>}, <<"Bearer Realm=\"minirest-server\"">>},
@ -145,7 +154,7 @@ authorize_appid(Req) ->
end; end;
_ -> _ ->
{401, #{<<"WWW-Authenticate">> => {401, #{<<"WWW-Authenticate">> =>
<<"Bearer Realm=\"minirest-server\"">>}, <<"Basic Realm=\"minirest-server\"">>},
#{code => <<"UNAUTHORIZED">>, #{code => <<"ERROR_USERNAME_OR_PWD">>,
message => <<"POST '/login'">>}} message => <<"Check your username and password">>}}
end. end.