Merge pull request #10877 from lafirest/fix/rocketmq_sensitive_data

fix(rocketmq): bump RocketMQ driver to enhance security for sensitive data
This commit is contained in:
lafirest 2023-05-31 18:54:44 +08:00 committed by GitHub
commit 502b24bbe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{erl_opts, [debug_info]}.
{deps, [
{rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.1"}}},
{rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.3"}}},
{emqx_connector, {path, "../../apps/emqx_connector"}},
{emqx_resource, {path, "../../apps/emqx_resource"}},
{emqx_bridge, {path, "../../apps/emqx_bridge"}}

View File

@ -1,6 +1,6 @@
{application, emqx_bridge_rocketmq, [
{description, "EMQX Enterprise RocketMQ Bridge"},
{vsn, "0.1.1"},
{vsn, "0.1.2"},
{registered, []},
{applications, [kernel, stdlib, rocketmq]},
{env, []},

View File

@ -115,7 +115,7 @@ on_start(
sync_timeout => SyncTimeout,
templates => Templates,
producers_map_pid => ProducersMapPID,
producers_opts => emqx_secret:wrap(ProducerOpts)
producers_opts => ProducerOpts
},
case rocketmq:ensure_supervised_client(ClientId, Servers, ClientCfg) of
@ -295,7 +295,7 @@ make_producer_opts(
#{
tcp_opts => [{sndbuf, SendBuff}],
ref_topic_route_interval => RefreshInterval,
acl_info => ACLInfo
acl_info => emqx_secret:wrap(ACLInfo)
}.
acl_info(<<>>, <<>>, <<>>) ->
@ -338,7 +338,7 @@ get_producers(ClientId, {_, Topic1} = TopicKey, ProducerOpts) ->
_ ->
ProducerGroup = iolist_to_binary([atom_to_list(ClientId), "_", Topic1]),
{ok, Producers0} = rocketmq:ensure_supervised_producers(
ClientId, ProducerGroup, Topic1, emqx_secret:unwrap(ProducerOpts)
ClientId, ProducerGroup, Topic1, ProducerOpts
),
ets:insert(ClientId, {TopicKey, Producers0}),
Producers0

View File

@ -0,0 +1 @@
Bump RocketMQ driver to enhance security for sensitive data.