From e8542b7cd736b37ddef6812319b160c42eed84da Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:38:59 +0200 Subject: [PATCH] chore(gen_rpc): Bump version to 3.0.0 --- changes/v4.4.11-en.md | 2 ++ changes/v4.4.11-zh.md | 2 ++ priv/emqx.schema | 6 ++++++ rebar.config | 2 +- src/emqx.appup.src | 33 ++++++++++++++++++++++----------- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/changes/v4.4.11-en.md b/changes/v4.4.11-en.md index e899b12c2..b8876c342 100644 --- a/changes/v4.4.11-en.md +++ b/changes/v4.4.11-en.md @@ -22,6 +22,8 @@ This feature is so far only used in EMQX Enterprise Google PubSub integration. Can be used as webhook integration's JWT authenticationa against the webhook service endpoint. +- Update `gen_rpc` dependency to 3.0.0. + ### Bug fixes - Fix get trace list crash when trace not initialize. [#9156](https://github.com/emqx/emqx/pull/9156) diff --git a/changes/v4.4.11-zh.md b/changes/v4.4.11-zh.md index 7142dd5de..b687e1c2d 100644 --- a/changes/v4.4.11-zh.md +++ b/changes/v4.4.11-zh.md @@ -19,6 +19,8 @@ 该功能现在仅用于 EMQX 企业版的 Google PubSub 集成中。 后续会用于 webhook 集成的 JWT 认证。 +- 更新`gen_rpc`依赖关系至 3.0.0。 + ### 修复 - 修复日志追踪模块没开启时，GET Trace 列表接口报错的问题。[#9156](https://github.com/emqx/emqx/pull/9156) diff --git a/priv/emqx.schema b/priv/emqx.schema index e2daf197f..c2aa3765e 100644 --- a/priv/emqx.schema +++ b/priv/emqx.schema @@ -532,6 +532,12 @@ end}. {datatype, bytesize} ]}. +%% Enable insecure authentication fallback (enabled by default in 4.4) +{mapping, "rpc.insecure_fallback", "gen_rpc.insecure_auth_fallback_allowed", [ + {default, true}, + {datatype, {enum, [true, false]}} +]}. + {validator, "range:gt_0_lt_256", "must greater than 0 and less than 256", fun(X) -> X >= 0 andalso X < 256 end }. diff --git a/rebar.config b/rebar.config index ae93dbc04..d0b7d38d3 100644 --- a/rebar.config +++ b/rebar.config @@ -48,7 +48,7 @@ , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.7"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.1.11"}}} - , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.7.1"}}} + , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.0.1"}}} , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.6"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.10"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}} diff --git a/src/emqx.appup.src b/src/emqx.appup.src index c3d1d5312..6545a4b4c 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -16,7 +16,8 @@ {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]}, {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx,brutal_purge,soft_purge,[]}, - {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.9", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -39,7 +40,8 @@ {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_connection,brutal_purge,soft_purge,[]}, {load_module,emqx_router,brutal_purge,soft_purge,[]}, - {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.8", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -63,7 +65,8 @@ {load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_cm,brutal_purge,soft_purge,[]}, - {load_module,emqx_message,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_message,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.7", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -87,7 +90,8 @@ {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}, - {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.6", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -111,7 +115,8 @@ {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}, - {load_module,emqx,brutal_purge,soft_purge,[]}]}, + {load_module,emqx,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.5", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -137,7 +142,8 @@ {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}, - {load_module,emqx_session,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_session,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.4", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -170,7 +176,8 @@ {load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_metrics,brutal_purge,soft_purge,[]}, - {load_module,emqx_session,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_session,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.3", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -210,7 +217,8 @@ {apply,{emqx_metrics,assign_auth_stats_from_ets_to_counter,[]}}, {load_module,emqx_access_control,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]}, - {load_module,emqx_relup}]}, + {load_module,emqx_relup}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.2", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -251,7 +259,8 @@ {load_module,emqx,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]}, - {load_module,emqx_relup}]}, + {load_module,emqx_relup}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.1", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -297,7 +306,8 @@ {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_connection,brutal_purge,soft_purge,[]}, - {add_module,emqx_relup}]}, + {add_module,emqx_relup}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {"4.4.0", [{add_module,emqx_ocsp_cache}, {add_module,emqx_crl_cache}, @@ -345,7 +355,8 @@ {load_module,emqx,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]}, - {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, + {load_module,emqx_limiter,brutal_purge,soft_purge,[]}, + {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]}, {<<".*">>,[]}], [{"4.4.10", [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},