diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index f3089d11f..0816b013e 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -30,7 +30,7 @@ {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.11.2"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.19.5"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.3.1"}}}, - {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.42.2"}}}, + {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.43.1"}}}, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.3"}}}, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}, {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}, diff --git a/apps/emqx_bridge/test/emqx_bridge_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_SUITE.erl index 7273df000..e510dda7f 100644 --- a/apps/emqx_bridge/test/emqx_bridge_SUITE.erl +++ b/apps/emqx_bridge/test/emqx_bridge_SUITE.erl @@ -216,7 +216,7 @@ t_create_with_bad_name(_Config) -> ok. t_create_with_bad_name_root(_Config) -> - BadBridgeName = <<"test_哈哈">>, + BadBridgeName = <<"test_哈哈"/utf8>>, BridgeConf = #{ <<"bridge_mode">> => false, <<"clean_start">> => true, diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl index 08b3270ea..6b160f3b3 100644 --- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl +++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl @@ -1431,7 +1431,7 @@ t_cluster_later_join_metrics(Config) -> t_create_with_bad_name(Config) -> Port = ?config(port, Config), URL1 = ?URL(Port, "path1"), - Name = <<"test_哈哈">>, + Name = <<"test_哈哈"/utf8>>, BadBridgeParams = emqx_utils_maps:deep_merge( ?HTTP_BRIDGE(URL1, Name), @@ -1457,7 +1457,7 @@ t_create_with_bad_name(Config) -> ?assertMatch( #{ <<"kind">> := <<"validation_error">>, - <<"reason">> := <<"Invalid name format.", _/binary>> + <<"reason">> := <<"invalid_map_key">> }, Msg ), diff --git a/apps/emqx_bridge/test/emqx_bridge_v1_compatibility_layer_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_v1_compatibility_layer_SUITE.erl index c0b8acc0d..0fc13ffb0 100644 --- a/apps/emqx_bridge/test/emqx_bridge_v1_compatibility_layer_SUITE.erl +++ b/apps/emqx_bridge/test/emqx_bridge_v1_compatibility_layer_SUITE.erl @@ -604,8 +604,7 @@ deprecated_config() -> t_name_too_long(_Config) -> LongName = list_to_binary(lists:duplicate(256, $a)), ?assertMatch( - {error, - {{_, 400, _}, _, #{<<"message">> := #{<<"reason">> := <<"Name is too long", _/binary>>}}}}, + {error, {{_, 400, _}, _, #{<<"message">> := #{<<"reason">> := <<"invalid_map_key">>}}}}, create_bridge_http_api_v1(#{name => LongName}) ), ok. @@ -942,7 +941,7 @@ t_scenario_2(Config) -> ok. t_create_with_bad_name(_Config) -> - BadBridgeName = <<"test_哈哈">>, + BadBridgeName = <<"test_哈哈"/utf8>>, %% Note: must contain SSL options to trigger bug. Cacertfile = emqx_common_test_helpers:app_path( emqx, @@ -960,7 +959,7 @@ t_create_with_bad_name(_Config) -> <<"code">> := <<"BAD_REQUEST">>, <<"message">> := #{ <<"kind">> := <<"validation_error">>, - <<"reason">> := <<"Invalid name format.", _/binary>> + <<"reason">> := <<"invalid_map_key">> } }}} = create_bridge_http_api_v1(Opts), ok. diff --git a/apps/emqx_connector/test/emqx_connector_SUITE.erl b/apps/emqx_connector/test/emqx_connector_SUITE.erl index 1b210e7fb..fbdece6ff 100644 --- a/apps/emqx_connector/test/emqx_connector_SUITE.erl +++ b/apps/emqx_connector/test/emqx_connector_SUITE.erl @@ -275,7 +275,7 @@ t_create_with_bad_name_root_path({'end', _Config}) -> ok; t_create_with_bad_name_root_path(_Config) -> Path = [connectors], - BadConnectorName = <<"test_哈哈">>, + BadConnectorName = <<"test_哈哈"/utf8>>, ConnConfig0 = connector_config(), %% Note: must contain SSL options to trigger original bug. Cacertfile = emqx_common_test_helpers:app_path( diff --git a/apps/emqx_connector/test/emqx_connector_api_SUITE.erl b/apps/emqx_connector/test/emqx_connector_api_SUITE.erl index 7c7bc432c..f3e91ef12 100644 --- a/apps/emqx_connector/test/emqx_connector_api_SUITE.erl +++ b/apps/emqx_connector/test/emqx_connector_api_SUITE.erl @@ -697,7 +697,7 @@ t_connectors_probe(Config) -> ok. t_create_with_bad_name(Config) -> - ConnectorName = <<"test_哈哈">>, + ConnectorName = <<"test_哈哈"/utf8>>, Conf0 = ?KAFKA_CONNECTOR(ConnectorName), %% Note: must contain SSL options to trigger original bug. Cacertfile = emqx_common_test_helpers:app_path( diff --git a/changes/ce/fix-13403.en.md b/changes/ce/fix-13403.en.md new file mode 100644 index 000000000..1a02fffe7 --- /dev/null +++ b/changes/ce/fix-13403.en.md @@ -0,0 +1 @@ +Fixed environment variable config override logging behaviour to avoid logging passwords. diff --git a/mix.exs b/mix.exs index 41ab01b37..313059bde 100644 --- a/mix.exs +++ b/mix.exs @@ -177,7 +177,7 @@ defmodule EMQXUmbrella.MixProject do def common_dep(:ekka), do: {:ekka, github: "emqx/ekka", tag: "0.19.5", override: true} def common_dep(:esockd), do: {:esockd, github: "emqx/esockd", tag: "5.11.2", override: true} def common_dep(:gproc), do: {:gproc, github: "emqx/gproc", tag: "0.9.0.1", override: true} - def common_dep(:hocon), do: {:hocon, github: "emqx/hocon", tag: "0.42.2", override: true} + def common_dep(:hocon), do: {:hocon, github: "emqx/hocon", tag: "0.43.1", override: true} def common_dep(:lc), do: {:lc, github: "emqx/lc", tag: "0.3.2", override: true} # in conflict by ehttpc and emqtt def common_dep(:gun), do: {:gun, github: "emqx/gun", tag: "1.3.11", override: true} diff --git a/rebar.config b/rebar.config index 3b097f6fa..8f689ea3d 100644 --- a/rebar.config +++ b/rebar.config @@ -97,7 +97,7 @@ {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.5"}}}, {getopt, "1.0.2"}, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.10"}}}, - {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.42.2"}}}, + {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.43.1"}}}, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.3"}}}, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.1"}}}, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}},