Jelajahi Sumber

Merge pull request #9916 from qzhuyan/fix/william/bridge-mqtt-TLS-verify-wildcard-peer

fix(mqtt-bridge): support verify TLS wildcard cert
Zaiming (Stone) Shi 3 tahun lalu
induk
melakukan
d1eb788ee1
5 mengubah file dengan 6 tambahan dan 3 penghapusan
  1. 1 1
      apps/emqx/rebar.config
  2. 2 0
      changes/v5.0.17/fix-9916.en.md
  3. 1 0
      changes/v5.0.17/fix-9916.zh.md
  4. 1 1
      mix.exs
  5. 1 1
      rebar.config

+ 1 - 1
apps/emqx/rebar.config

@@ -43,7 +43,7 @@
             {meck, "0.9.2"},
             {proper, "1.4.0"},
             {bbmustache, "1.10.0"},
-            {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0-rc.1"}}}
+            {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0"}}}
         ]},
         {extra_src_dirs, [{"test", [recursive]}]}
     ]}

+ 2 - 0
changes/v5.0.17/fix-9916.en.md

@@ -0,0 +1,2 @@
+Fix MQTT bridge fails to verify TLS wildcard server certificate. 
+

+ 1 - 0
changes/v5.0.17/fix-9916.zh.md

@@ -0,0 +1 @@
+修复MQTT桥接器无法验证TLS通配符服务器证书的问题。

+ 1 - 1
mix.exs

@@ -60,7 +60,7 @@ defmodule EMQXUmbrella.MixProject do
       {:ecpool, github: "emqx/ecpool", tag: "0.5.3", override: true},
       {:replayq, github: "emqx/replayq", tag: "0.3.7", override: true},
       {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
-      {:emqtt, github: "emqx/emqtt", tag: "1.7.0-rc.2", override: true},
+      {:emqtt, github: "emqx/emqtt", tag: "1.7.0", override: true},
       {:rulesql, github: "emqx/rulesql", tag: "0.1.4"},
       {:observer_cli, "1.7.1"},
       {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},

+ 1 - 1
rebar.config

@@ -62,7 +62,7 @@
     , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.3"}}}
     , {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}}
     , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
-    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0-rc.2"}}}
+    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0"}}}
     , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.4"}}}
     , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}