fix(mqtt-bridge): disallow QoS 2 on ingress bridges
This commit is contained in:
parent
5d59fcbf23
commit
7002fe2ef4
|
@ -52,7 +52,7 @@
|
||||||
-define(INGRESS_CONF, #{
|
-define(INGRESS_CONF, #{
|
||||||
<<"remote">> => #{
|
<<"remote">> => #{
|
||||||
<<"topic">> => <<?INGRESS_REMOTE_TOPIC, "/#">>,
|
<<"topic">> => <<?INGRESS_REMOTE_TOPIC, "/#">>,
|
||||||
<<"qos">> => 2
|
<<"qos">> => 1
|
||||||
},
|
},
|
||||||
<<"local">> => #{
|
<<"local">> => #{
|
||||||
<<"topic">> => <<?INGRESS_LOCAL_TOPIC, "/${topic}">>,
|
<<"topic">> => <<?INGRESS_LOCAL_TOPIC, "/${topic}">>,
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
-define(INGRESS_CONF_NO_PAYLOAD_TEMPLATE, #{
|
-define(INGRESS_CONF_NO_PAYLOAD_TEMPLATE, #{
|
||||||
<<"remote">> => #{
|
<<"remote">> => #{
|
||||||
<<"topic">> => <<?INGRESS_REMOTE_TOPIC, "/#">>,
|
<<"topic">> => <<?INGRESS_REMOTE_TOPIC, "/#">>,
|
||||||
<<"qos">> => 2
|
<<"qos">> => 1
|
||||||
},
|
},
|
||||||
<<"local">> => #{
|
<<"local">> => #{
|
||||||
<<"topic">> => <<?INGRESS_LOCAL_TOPIC, "/${topic}">>,
|
<<"topic">> => <<?INGRESS_LOCAL_TOPIC, "/${topic}">>,
|
||||||
|
@ -265,6 +265,34 @@ t_mqtt_conn_bridge_ignores_clean_start(_) ->
|
||||||
|
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
|
t_mqtt_conn_bridge_ingress_downgrades_qos_2(_) ->
|
||||||
|
BridgeName = atom_to_binary(?FUNCTION_NAME),
|
||||||
|
BridgeID = create_bridge(
|
||||||
|
?SERVER_CONF(<<"user1">>)#{
|
||||||
|
<<"type">> => ?TYPE_MQTT,
|
||||||
|
<<"name">> => BridgeName,
|
||||||
|
<<"ingress">> => emqx_map_lib:deep_merge(
|
||||||
|
?INGRESS_CONF,
|
||||||
|
#{<<"remote">> => #{<<"qos">> => 2}}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
),
|
||||||
|
|
||||||
|
RemoteTopic = <<?INGRESS_REMOTE_TOPIC, "/1">>,
|
||||||
|
LocalTopic = <<?INGRESS_LOCAL_TOPIC, "/", RemoteTopic/binary>>,
|
||||||
|
Payload = <<"whatqos">>,
|
||||||
|
emqx:subscribe(LocalTopic),
|
||||||
|
emqx:publish(emqx_message:make(undefined, _QoS = 2, RemoteTopic, Payload)),
|
||||||
|
|
||||||
|
%% we should receive a message on the local broker, with specified topic
|
||||||
|
Msg = assert_mqtt_msg_received(LocalTopic, Payload),
|
||||||
|
?assertMatch(#message{qos = 1}, Msg),
|
||||||
|
|
||||||
|
%% delete the bridge
|
||||||
|
{ok, 204, <<>>} = request(delete, uri(["bridges", BridgeID]), []),
|
||||||
|
|
||||||
|
ok.
|
||||||
|
|
||||||
t_mqtt_conn_bridge_ingress_no_payload_template(_) ->
|
t_mqtt_conn_bridge_ingress_no_payload_template(_) ->
|
||||||
User1 = <<"user1">>,
|
User1 = <<"user1">>,
|
||||||
BridgeIDIngress = create_bridge(
|
BridgeIDIngress = create_bridge(
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
-include_lib("typerefl/include/types.hrl").
|
-include_lib("typerefl/include/types.hrl").
|
||||||
-include_lib("hocon/include/hoconsc.hrl").
|
-include_lib("hocon/include/hoconsc.hrl").
|
||||||
|
-include_lib("emqx/include/logger.hrl").
|
||||||
|
|
||||||
-behaviour(hocon_schema).
|
-behaviour(hocon_schema).
|
||||||
|
|
||||||
|
@ -143,8 +144,7 @@ fields("ingress") ->
|
||||||
mk(
|
mk(
|
||||||
ref(?MODULE, "ingress_local"),
|
ref(?MODULE, "ingress_local"),
|
||||||
#{
|
#{
|
||||||
desc => ?DESC(emqx_connector_mqtt_schema, "ingress_local"),
|
desc => ?DESC(emqx_connector_mqtt_schema, "ingress_local")
|
||||||
is_required => false
|
|
||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
];
|
];
|
||||||
|
@ -161,7 +161,7 @@ fields("ingress_remote") ->
|
||||||
)},
|
)},
|
||||||
{qos,
|
{qos,
|
||||||
mk(
|
mk(
|
||||||
qos(),
|
emqx_schema:qos(),
|
||||||
#{
|
#{
|
||||||
default => 1,
|
default => 1,
|
||||||
desc => ?DESC("ingress_remote_qos")
|
desc => ?DESC("ingress_remote_qos")
|
||||||
|
|
|
@ -114,7 +114,7 @@ start_link(Name, BridgeOpts) ->
|
||||||
name => Name,
|
name => Name,
|
||||||
options => BridgeOpts
|
options => BridgeOpts
|
||||||
}),
|
}),
|
||||||
Conf = init_config(BridgeOpts),
|
Conf = init_config(Name, BridgeOpts),
|
||||||
Options = mk_client_options(Conf, BridgeOpts),
|
Options = mk_client_options(Conf, BridgeOpts),
|
||||||
case emqtt:start_link(Options) of
|
case emqtt:start_link(Options) of
|
||||||
{ok, Pid} ->
|
{ok, Pid} ->
|
||||||
|
@ -129,13 +129,13 @@ start_link(Name, BridgeOpts) ->
|
||||||
Error
|
Error
|
||||||
end.
|
end.
|
||||||
|
|
||||||
init_config(Opts) ->
|
init_config(Name, Opts) ->
|
||||||
Mountpoint = maps:get(forward_mountpoint, Opts, undefined),
|
Mountpoint = maps:get(forward_mountpoint, Opts, undefined),
|
||||||
Subscriptions = maps:get(subscriptions, Opts, undefined),
|
Subscriptions = maps:get(subscriptions, Opts, undefined),
|
||||||
Forwards = maps:get(forwards, Opts, undefined),
|
Forwards = maps:get(forwards, Opts, undefined),
|
||||||
#{
|
#{
|
||||||
mountpoint => format_mountpoint(Mountpoint),
|
mountpoint => format_mountpoint(Mountpoint),
|
||||||
subscriptions => pre_process_subscriptions(Subscriptions),
|
subscriptions => pre_process_subscriptions(Subscriptions, Name, Opts),
|
||||||
forwards => pre_process_forwards(Forwards)
|
forwards => pre_process_forwards(Forwards)
|
||||||
}.
|
}.
|
||||||
|
|
||||||
|
@ -282,11 +282,18 @@ format_mountpoint(undefined) ->
|
||||||
format_mountpoint(Prefix) ->
|
format_mountpoint(Prefix) ->
|
||||||
binary:replace(iolist_to_binary(Prefix), <<"${node}">>, atom_to_binary(node(), utf8)).
|
binary:replace(iolist_to_binary(Prefix), <<"${node}">>, atom_to_binary(node(), utf8)).
|
||||||
|
|
||||||
pre_process_subscriptions(undefined) ->
|
pre_process_subscriptions(undefined, _, _) ->
|
||||||
undefined;
|
undefined;
|
||||||
pre_process_subscriptions(#{local := LC} = Conf) when is_map(Conf) ->
|
pre_process_subscriptions(
|
||||||
Conf#{local => pre_process_in_out_common(LC)};
|
#{remote := RC, local := LC} = Conf,
|
||||||
pre_process_subscriptions(Conf) when is_map(Conf) ->
|
BridgeName,
|
||||||
|
BridgeOpts
|
||||||
|
) when is_map(Conf) ->
|
||||||
|
Conf#{
|
||||||
|
remote => pre_process_in_remote(RC, BridgeName, BridgeOpts),
|
||||||
|
local => pre_process_in_out_common(LC)
|
||||||
|
};
|
||||||
|
pre_process_subscriptions(Conf, _, _) when is_map(Conf) ->
|
||||||
%% have no 'local' field in the config
|
%% have no 'local' field in the config
|
||||||
undefined.
|
undefined.
|
||||||
|
|
||||||
|
@ -314,6 +321,27 @@ pre_process_conf(Key, Conf) ->
|
||||||
Conf#{Key => Val}
|
Conf#{Key => Val}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
pre_process_in_remote(#{qos := QoSIn} = Conf, BridgeName, BridgeOpts) ->
|
||||||
|
QoS = downgrade_ingress_qos(QoSIn),
|
||||||
|
case QoS of
|
||||||
|
QoSIn ->
|
||||||
|
ok;
|
||||||
|
_ ->
|
||||||
|
?SLOG(warning, #{
|
||||||
|
msg => "downgraded_unsupported_ingress_qos",
|
||||||
|
qos_configured => QoSIn,
|
||||||
|
qos_used => QoS,
|
||||||
|
name => BridgeName,
|
||||||
|
options => BridgeOpts
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
Conf#{qos => QoS}.
|
||||||
|
|
||||||
|
downgrade_ingress_qos(2) ->
|
||||||
|
1;
|
||||||
|
downgrade_ingress_qos(QoS) ->
|
||||||
|
QoS.
|
||||||
|
|
||||||
get_pid(Name) ->
|
get_pid(Name) ->
|
||||||
case gproc:where(?NAME(Name)) of
|
case gproc:where(?NAME(Name)) of
|
||||||
Pid when is_pid(Pid) ->
|
Pid when is_pid(Pid) ->
|
||||||
|
|
Loading…
Reference in New Issue