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 3b9d13c9b..414db2632 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 5462565ac..b26572355 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 1572fc18e..9cb70c6cc 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -21,7 +21,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}, @@ -44,7 +45,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}, @@ -68,7 +70,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}, @@ -92,7 +95,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}, @@ -116,7 +120,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}, @@ -142,7 +147,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}, @@ -175,7 +181,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}, @@ -215,7 +222,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}, @@ -256,7 +264,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}, @@ -302,7 +311,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}, @@ -350,7 +360,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.11", [{load_module,emqx_relup,brutal_purge,soft_purge,[]},