Merge pull request #10094 from qzhuyan/fix/william/mqtt-bridge-TLS-wildcard-cert

fix: mqtt bridge tls wildcard cert
This commit is contained in:
William Yang 2023-03-09 09:21:49 +01:00 committed by GitHub
commit a965649421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions

View File

@ -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

6
changes/v4.4.16-en.md Normal file
View File

@ -0,0 +1,6 @@
# v4.4.16
## Bug fixes
- Fixed MQTT bridge TLS connection could not verify wildcard certificate from peer[#10094](https://github.com/emqx/emqx/pull/10094).

5
changes/v4.4.16-zh.md Normal file
View File

@ -0,0 +1,5 @@
# v4.4.15
## 修复
- 修正了 MQTT 桥接 TLS 连接无法验证对端的带通配符的证书[#10094](https://github.com/emqx/emqx/pull/10094)。

View File

@ -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