yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9470 from thalesmg/check-unpack-target-v43 

fix(install_upgrade): check target version when unpacking (v4.3)
This commit is contained in:
Thales Macedo Garitezi 2022-12-06 13:09:26 -03:00 committed by GitHub
parent b1f72f4c36 a94f3464f5
commit ede0495939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/run_automate_tests.yaml vendored
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-20.04
outputs: outputs:
imgname: ${{ steps.build_docker.outputs.imgname}} imgname: ${{ steps.build_docker.outputs.imgname}}
version: ${{ steps.build_docker.outputs.version}} version: ${{ steps.build_docker.outputs.version}}

1
bin/install_upgrade.escript
View File

@ -32,6 +32,7 @@ main(Args) ->
unpack({RelName, NameTypeArg, NodeName, Cookie}, Opts) -> unpack({RelName, NameTypeArg, NodeName, Cookie}, Opts) ->
TargetNode = start_distribution(NodeName, NameTypeArg, Cookie), TargetNode = start_distribution(NodeName, NameTypeArg, Cookie),
Version = proplists:get_value(version, Opts), Version = proplists:get_value(version, Opts),
validate_target_version(Version, TargetNode),
case unpack_release(RelName, TargetNode, Version) of case unpack_release(RelName, TargetNode, Version) of
{ok, Vsn} -> {ok, Vsn} ->
?INFO("Unpacked successfully: ~p", [Vsn]); ?INFO("Unpacked successfully: ~p", [Vsn]);

2
changes/v4.3.23-en.md
View File

@ -11,3 +11,5 @@
## Bug fixes ## Bug fixes
- Fix a bug where the JWT ACL would not short-circuit with a deny response when the token is expired [#9338](https://github.com/emqx/emqx/pull/9338). - Fix a bug where the JWT ACL would not short-circuit with a deny response when the token is expired [#9338](https://github.com/emqx/emqx/pull/9338).
- Added check for target version when unpacking a package for hot-upgrade. The unpacking could lead to unresponsive node commands. [#9470](https://github.com/emqx/emqx/pull/9470)

2
changes/v4.3.23-zh.md
View File

@ -11,3 +11,5 @@
## 修复 ## 修复
- 修复 JWT ACL 在令牌超期后授权检查不生效的问题 [#9338](https://github.com/emqx/emqx/pull/9338)。 - 修复 JWT ACL 在令牌超期后授权检查不生效的问题 [#9338](https://github.com/emqx/emqx/pull/9338)。
- 为热升级解压软件包时增加了对目标版本的检查。 解包可能导致节点命令无响应。 [#9470](https://github.com/emqx/emqx/pull/9470)