From 2cfec75652a2c6047d75afcf7026c66bd6a02842 Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 8 Mar 2023 11:16:47 +0100 Subject: [PATCH 1/3] fix: MQTT bridge verify wildcard certs --- changes/v4.4.16-en.md | 6 ++++++ changes/v4.4.16-zh.md | 5 +++++ rebar.config | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 changes/v4.4.16-en.md create mode 100644 changes/v4.4.16-zh.md diff --git a/changes/v4.4.16-en.md b/changes/v4.4.16-en.md new file mode 100644 index 000000000..a31162b9d --- /dev/null +++ b/changes/v4.4.16-en.md @@ -0,0 +1,6 @@ +# v4.4.16 + +## Bug fixes + +- Fixed MQTT bridge TLS connection could not verify wildcard certificate from peer. + diff --git a/changes/v4.4.16-zh.md b/changes/v4.4.16-zh.md new file mode 100644 index 000000000..87d772cc3 --- /dev/null +++ b/changes/v4.4.16-zh.md @@ -0,0 +1,5 @@ +# v4.4.15 + +## 修复 + +- 修正了 MQTT 桥接 TLS 连接无法验证对端的带通配符的证书。 diff --git a/rebar.config b/rebar.config index f79883957..79976aa39 100644 --- a/rebar.config +++ b/rebar.config @@ -55,7 +55,7 @@ , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}} , {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.5"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}} - , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}} + , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.2"}}} , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.5"}}} , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}} , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1 From ddd08b782fb24bceb6a6f8424f8884006a875060 Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 8 Mar 2023 11:59:06 +0100 Subject: [PATCH 2/3] docs: update changelogs. --- changes/v4.4.16-en.md | 2 +- changes/v4.4.16-zh.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/v4.4.16-en.md b/changes/v4.4.16-en.md index a31162b9d..a853b9e95 100644 --- a/changes/v4.4.16-en.md +++ b/changes/v4.4.16-en.md @@ -2,5 +2,5 @@ ## Bug fixes -- Fixed MQTT bridge TLS connection could not verify wildcard certificate from peer. +- Fixed MQTT bridge TLS connection could not verify wildcard certificate from peer[#10094](https://github.com/emqx/emqx/pull/10094). diff --git a/changes/v4.4.16-zh.md b/changes/v4.4.16-zh.md index 87d772cc3..06ee1c281 100644 --- a/changes/v4.4.16-zh.md +++ b/changes/v4.4.16-zh.md @@ -2,4 +2,4 @@ ## 修复 -- 修正了 MQTT 桥接 TLS 连接无法验证对端的带通配符的证书。 +- 修正了 MQTT 桥接 TLS 连接无法验证对端的带通配符的证书[#10094](https://github.com/emqx/emqx/pull/10094)。 From 0983c2dd55927c15d151da0184c137e4f84cdacc Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 8 Mar 2023 18:05:23 +0100 Subject: [PATCH 3/3] ci: docker-compose to docker compose --- .github/workflows/run_test_cases.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 38cd2f9bb..9a0ea738d 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -201,7 +201,7 @@ jobs: if [[ ${{ matrix.app_name }} == *ldap ]]; then docker_compose_files="${docker_compose_files} -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml" fi - docker-compose $docker_compose_files up -d --build + docker compose $docker_compose_files up -d --build if [ -f EMQX_ENTERPRISE ]; then docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store" fi @@ -211,7 +211,7 @@ jobs: docker ps -a --filter name=client echo "waiting for docker ${client} to exit" if ! timeout 60 docker wait "${client}"; then - docker-compose $docker_compose_files logs | tee docker-compose.log + docker compose $docker_compose_files logs | tee docker-compose.log exit 1 fi done