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

chore: fix bugs

This commit is contained in:
JianBo He 2023-09-22 11:56:53 +08:00 committed by JimMoen
parent 47badc3181
commit 4a26f63bd6
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
View File

@ -107,8 +107,8 @@ create(
%% certificate = Cert, %% certificate = Cert,
sp_sign_requests = SignRequest, sp_sign_requests = SignRequest,
trusted_fingerprints = [], trusted_fingerprints = [],
consume_uri = BaseURL ++ "/sso_saml/acs", consume_uri = BaseURL ++ "/sso/saml/acs",
metadata_uri = BaseURL ++ "/sso_saml/metadata", metadata_uri = BaseURL ++ "/sso/saml/metadata",
org = #esaml_org{ org = #esaml_org{
name = "EMQX Team", name = "EMQX Team",
displayname = "EMQX Dashboard", displayname = "EMQX Dashboard",
@ -139,17 +139,14 @@ login(_Req, #{sp := SP, idp_meta := #esaml_idp_metadata{login_location = IDP}} =
Target = esaml_binding:encode_http_redirect(IDP, SignedXml, <<>>), Target = esaml_binding:encode_http_redirect(IDP, SignedXml, <<>>),
%% TODO: _Req acutally is HTTP request body, not fully request %% TODO: _Req acutally is HTTP request body, not fully request
RedirectFun = fun(Headers) -> RedirectFun = fun(Headers) ->
RespHeaders = #{<<"Cache-Control">> => <<"no-cache">>, <<"Pragma">> => <<"no-cache">>},
case is_msie(Headers) of case is_msie(Headers) of
true -> true ->
Html = esaml_binding:encode_http_post(IDP, SignedXml, <<>>), Html = esaml_binding:encode_http_post(IDP, SignedXml, <<>>),
{200, {200, RespHeaders, Html};
[
{<<"Cache-Control">>, <<"no-cache">>},
{<<"Pragma">>, <<"no-cache">>}
],
Html};
false -> false ->
{302, redirect_header(Target), <<"Redirecting...">>} RespHeaders1 = RespHeaders#{<<"Location">> => Target},
{302, RespHeaders1, <<"Redirecting...">>}
end end
end, end,
{redirect, RedirectFun}. {redirect, RedirectFun}.
@ -178,13 +175,6 @@ is_msie(Headers) ->
UA = maps:get(<<"user-agent">>, Headers, <<"">>), UA = maps:get(<<"user-agent">>, Headers, <<"">>),
not (binary:match(UA, <<"MSIE">>) =:= nomatch). not (binary:match(UA, <<"MSIE">>) =:= nomatch).
redirect_header(TargetUrl) ->
[
{<<"Cache-Control">>, <<"no-cache">>},
{<<"Pragma">>, <<"no-cache">>},
{<<"Location">>, TargetUrl}
].
%% TODO: unify with emqx_dashboard_sso_manager:ensure_user_exists/1 %% TODO: unify with emqx_dashboard_sso_manager:ensure_user_exists/1
ensure_user_exists(Username) -> ensure_user_exists(Username) ->
case emqx_dashboard_admin:lookup_user(saml, Username) of case emqx_dashboard_admin:lookup_user(saml, Username) of