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

fix: saml callback should check saml state

This commit is contained in:
JimMoen 2023-09-27 17:35:08 +08:00
parent 1f8985d09e
commit af9e87c025
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_dashboard_sso/rebar.config
View File

@ -4,5 +4,5 @@
{deps, [
{emqx_ldap, {path, "../../apps/emqx_ldap"}},
{emqx_dashboard, {path, "../../apps/emqx_dashboard"}},
{esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.1"}}}
{esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.2"}}}
]}.

16
apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl
View File

@ -82,19 +82,17 @@ schema("/sso/saml/metadata") ->
sp_saml_metadata(get, _Req) ->
case emqx_dashboard_sso_manager:lookup_state(saml) of
undefined ->
{404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}};
#{sp := SP} = _State ->
#{enable := true, sp := SP} = _State ->
SignedXml = esaml_sp:generate_metadata(SP),
Metadata = xmerl:export([SignedXml], xmerl_xml),
{200, #{<<"Content-Type">> => <<"text/xml">>}, erlang:iolist_to_binary(Metadata)}
{200, #{<<"Content-Type">> => <<"text/xml">>}, erlang:iolist_to_binary(Metadata)};
_ ->
{404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}}
end.
sp_saml_callback(post, Req) ->
case emqx_dashboard_sso_manager:lookup_state(saml) of
undefined ->
{404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}};
State ->
State = #{enable := true} ->
case (provider(saml)):callback(Req, State) of
{redirect, Redirect} ->
Redirect;
@ -105,7 +103,9 @@ sp_saml_callback(post, Req) ->
reason => Reason
}),
{403, #{code => <<"UNAUTHORIZED">>, message => Reason}}
end
end;
_ ->
{404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}}
end.
%%--------------------------------------------------------------------