From 5ad7c2fa2cb23ce20184ad77dd010e7f112dbcfe Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 28 Sep 2023 11:14:20 +0200 Subject: [PATCH 1/3] test(dev): fix typo in remsh node name in ./dev script --- dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev b/dev index c6a3aaf21..9f2b9450e 100755 --- a/dev +++ b/dev @@ -416,7 +416,7 @@ boot() { gen_tmp_node_name() { local rnd rnd="$(od -t u -N 4 /dev/urandom | head -n1 | awk '{print $2 % 1000}')" - echo "remsh${rnd}-$EMQX_NODE_NAME}" + echo "remsh${rnd}-${EMQX_NODE_NAME}" } remsh() { From 7ddcd71412f3b7e4fd62be76e0847dfe99c85980 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 28 Sep 2023 11:15:18 +0200 Subject: [PATCH 2/3] docs(ssl_dist.conf): update doc link --- apps/emqx/etc/ssl_dist.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/etc/ssl_dist.conf b/apps/emqx/etc/ssl_dist.conf index b4c16e2cc..82c523534 100644 --- a/apps/emqx/etc/ssl_dist.conf +++ b/apps/emqx/etc/ssl_dist.conf @@ -1,6 +1,6 @@ %% This additional config file is used when the config 'cluster.proto_dist' in emqx.conf is set to 'inet_tls'. %% Which means the EMQX nodes will connect to each other over TLS. -%% For more information about inter-broker security, see: https://docs.emqx.com/en/enterprise/v5.0/deploy/cluster/security.html +%% For more information about inter-broker security, see: https://docs.emqx.com/en/enterprise/v5.3/deploy/cluster/security.html %% For more information in technical details see: http://erlang.org/doc/apps/ssl/ssl_distribution.html From b14425d8659bd29c9dc69a839fbb27637effd28d Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 28 Sep 2023 11:40:21 +0200 Subject: [PATCH 3/3] fix(sso/saml): ensure lower case http header name --- apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl index fecf433c4..ccc40e2c6 100644 --- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl +++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl @@ -85,7 +85,7 @@ sp_saml_metadata(get, _Req) -> #{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.