yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7558 from lafirest/fix/empty_topic_with_alias 

fix(frame): fix empty topic check error
This commit is contained in:
Xinyu Liu 2022-04-08 18:07:42 +08:00 committed by GitHub
parent d155c3adb5 eec204517f
commit 0a77e1a9b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emqx_frame.erl
View File

@ -265,7 +265,7 @@ parse_packet(#mqtt_packet_header{type = ?CONNACK}, <<AckFlags:8, ReasonCode:8, R
parse_packet(#mqtt_packet_header{type = ?PUBLISH, qos = QoS}, Bin, parse_packet(#mqtt_packet_header{type = ?PUBLISH, qos = QoS}, Bin,
#{strict_mode := StrictMode, version := Ver}) -> #{strict_mode := StrictMode, version := Ver}) ->
{TopicName, Rest} = parse_topic_name(Bin, StrictMode), {TopicName, Rest} = parse_utf8_string(Bin, StrictMode),
{PacketId, Rest1} = case QoS of {PacketId, Rest1} = case QoS of
?QOS_0 -> {undefined, Rest}; ?QOS_0 -> {undefined, Rest};
_ -> parse_packet_id(Rest) _ -> parse_packet_id(Rest)
@ -273,6 +273,7 @@ parse_packet(#mqtt_packet_header{type = ?PUBLISH, qos = QoS}, Bin,
(PacketId =/= undefined) andalso (PacketId =/= undefined) andalso
StrictMode andalso validate_packet_id(PacketId), StrictMode andalso validate_packet_id(PacketId),
{Properties, Payload} = parse_properties(Rest1, Ver, StrictMode), {Properties, Payload} = parse_properties(Rest1, Ver, StrictMode),
ok = ensure_topic_name_valid(StrictMode, TopicName, Properties),
Publish = #mqtt_packet_publish{topic_name = TopicName, Publish = #mqtt_packet_publish{topic_name = TopicName,
packet_id = PacketId, packet_id = PacketId,
properties = Properties properties = Properties
@ -357,8 +358,9 @@ parse_will_message(Packet = #mqtt_packet_connect{will_flag = true,
proto_ver = Ver}, proto_ver = Ver},
Bin, StrictMode) -> Bin, StrictMode) ->
{Props, Rest} = parse_properties(Bin, Ver, StrictMode), {Props, Rest} = parse_properties(Bin, Ver, StrictMode),
{Topic, Rest1} = parse_topic_name(Rest, StrictMode), {Topic, Rest1} = parse_utf8_string(Rest, StrictMode),
{Payload, Rest2} = parse_binary_data(Rest1), {Payload, Rest2} = parse_binary_data(Rest1),
ok = ensure_topic_name_valid(StrictMode, Topic, Props),
{Packet#mqtt_packet_connect{will_props = Props, {Packet#mqtt_packet_connect{will_props = Props,
will_topic = Topic, will_topic = Topic,
will_payload = Payload will_payload = Payload
@ -524,13 +526,14 @@ parse_binary_data(Bin)
when 2 > byte_size(Bin) -> when 2 > byte_size(Bin) ->
error(malformed_binary_data_length). error(malformed_binary_data_length).
parse_topic_name(Bin, false) -> ensure_topic_name_valid(false, _TopicName, _Properties) ->
parse_utf8_string(Bin, false); ok;
parse_topic_name(Bin, true) -> ensure_topic_name_valid(true, TopicName, _Properties) when TopicName =/= <<>> ->
case parse_utf8_string(Bin, true) of ok;
{<<>>, _Rest} -> error(empty_topic_name); ensure_topic_name_valid(true, <<>>, #{'Topic-Alias' := _}) ->
Result -> Result ok;
end. ensure_topic_name_valid(true, <<>>, _) ->
error(empty_topic_name).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Serialize MQTT Packet %% Serialize MQTT Packet

13
test/emqx_frame_SUITE.erl
View File

@ -163,12 +163,15 @@ t_parse_malformed_utf8_string(_) ->
?catch_error(utf8_string_invalid, emqx_frame:parse(MalformedPacket, ParseState)). ?catch_error(utf8_string_invalid, emqx_frame:parse(MalformedPacket, ParseState)).
t_parse_empty_topic_name(_) -> t_parse_empty_topic_name(_) ->
Packet = <<48, 4, 0, 0, 0, 1>>, Packet = ?PUBLISH_PACKET(?QOS_1, <<>>, 1, #{}, <<>>),
NormalState = emqx_frame:initial_parse_state(#{strict_mode => false}), ?assertEqual(Packet, parse_serialize(Packet, #{strict_mode => false})),
?assertMatch({_, _}, emqx_frame:parse(Packet, NormalState)), ?catch_error(empty_topic_name, parse_serialize(Packet, #{strict_mode => true})).
StrictState = emqx_frame:initial_parse_state(#{strict_mode => true}), t_parse_empty_topic_name_with_alias(_) ->
?catch_error(empty_topic_name, emqx_frame:parse(Packet, StrictState)). Props = #{'Topic-Alias' => 16#AB},
Packet = ?PUBLISH_PACKET(?QOS_1, <<>>, 1, Props, <<>>),
?assertEqual(Packet, parse_serialize(Packet, #{strict_mode => false})),
?assertEqual(Packet, parse_serialize(Packet, #{strict_mode => true})).
t_parse_frame_proxy_protocol(_) -> t_parse_frame_proxy_protocol(_) ->
BinList = [ <<"PROXY TCP4 ">>, <<"PROXY TCP6 ">>, <<"PROXY UNKNOWN">> BinList = [ <<"PROXY TCP4 ">>, <<"PROXY TCP6 ">>, <<"PROXY UNKNOWN">>