From d0120e1edcfa5594bd9b76aa3cecbc216cca7333 Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:51:32 +0200 Subject: [PATCH 1/2] chore(gen_rpc): Bump version to 3.0.0 --- CHANGES-5.0.md | 1 + apps/emqx_conf/i18n/emqx_conf_schema.conf | 11 +++++++++++ apps/emqx_conf/src/emqx_conf_schema.erl | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 6e78d3532..f885aae8f 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -10,6 +10,7 @@ This change fixed it to only send back the message ID. * Add /trace/:name/log_detail HTTP API to return trace file's size and mtime [#9152](https://github.com/emqx/emqx/pull/9152) * Allow clear retained/delayed data when client is banned.[#9139](https://github.com/emqx/emqx/pull/9139) +* Update `gen_rpc` library to version 3.0 [#9187](https://github.com/emqx/emqx/pull/9187) ## Bug fixes diff --git a/apps/emqx_conf/i18n/emqx_conf_schema.conf b/apps/emqx_conf/i18n/emqx_conf_schema.conf index fb986785b..6ba57f9ee 100644 --- a/apps/emqx_conf/i18n/emqx_conf_schema.conf +++ b/apps/emqx_conf/i18n/emqx_conf_schema.conf @@ -973,6 +973,17 @@ until the RPC connection is considered lost.""" } } + rpc_insecure_fallback { + desc { + en: """Enable compatibility with old RPC authentication.""" + zh: """启用与旧RPC认证的兼容性。""" + } + label { + en: "RPC insecure fallback" + zh: "RPC不安全的后退" + } + } + log_file_handlers { desc { en: """File-based log handlers.""" diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index ec61cb508..4de952d2e 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -814,6 +814,15 @@ fields("rpc") -> default => "1MB", desc => ?DESC(rpc_socket_buffer) } + )}, + {"insecure_fallback", + sc( + boolean(), + #{ + mapping => "gen_rpc.insecure_auth_fallback_allowed", + default => true, + desc => ?DESC(rpc_insecure_fallback) + } )} ]; fields("log") -> From 9d650a69b8a5c2a42add026f3d5f367c8b4caee3 Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:25:22 +0200 Subject: [PATCH 2/2] fix(gen_rpc): Fix Chinese translation --- apps/emqx_conf/i18n/emqx_conf_schema.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_conf/i18n/emqx_conf_schema.conf b/apps/emqx_conf/i18n/emqx_conf_schema.conf index 6ba57f9ee..101823d5f 100644 --- a/apps/emqx_conf/i18n/emqx_conf_schema.conf +++ b/apps/emqx_conf/i18n/emqx_conf_schema.conf @@ -976,11 +976,11 @@ until the RPC connection is considered lost.""" rpc_insecure_fallback { desc { en: """Enable compatibility with old RPC authentication.""" - zh: """启用与旧RPC认证的兼容性。""" + zh: """兼容旧的无鉴权模式""" } label { en: "RPC insecure fallback" - zh: "RPC不安全的后退" + zh: "向后兼容旧的无鉴权模式" } }