Skip to content

Commit

Permalink
fix(emqx): validate mqtt malformed variable byte integer
Browse files Browse the repository at this point in the history
  • Loading branch information
terry-xiaoyu committed Mar 12, 2021
1 parent 4a4883f commit 587aabd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/emqx_frame.erl
Expand Up @@ -107,6 +107,9 @@ parse_remaining_len(<<0:8, Rest/binary>>, Header, 1, 0, Options) ->
%% Match PUBACK, PUBREC, PUBREL, PUBCOMP, UNSUBACK...
parse_remaining_len(<<0:1, 2:7, Rest/binary>>, Header, 1, 0, Options) ->
parse_frame(Rest, Header, 2, Options);
parse_remaining_len(<<1:1, _Len:7, _Rest/binary>>, _Header, Multiplier, _Value, _Options)
when Multiplier > 2097152 ->
error(malformed_variable_byte_integer);
parse_remaining_len(<<1:1, Len:7, Rest/binary>>, Header, Multiplier, Value, Options) ->
parse_remaining_len(Rest, Header, Multiplier * ?HIGHBIT, Value + Len * Multiplier, Options);
parse_remaining_len(<<0:1, Len:7, Rest/binary>>, Header, Multiplier, Value,
Expand Down
14 changes: 12 additions & 2 deletions test/emqx_frame_SUITE.erl
Expand Up @@ -23,7 +23,8 @@
-include_lib("eunit/include/eunit.hrl").

all() ->
[{group, connect},
[{group, parse},
{group, connect},
{group, connack},
{group, publish},
{group, puback},
Expand All @@ -36,7 +37,10 @@ all() ->
{group, auth}].

groups() ->
[{connect, [parallel],
[{parse, [parallel],
[t_parse_frame_malformed_variable_byte_integer
]},
{connect, [parallel],
[serialize_parse_connect,
serialize_parse_v3_connect,
serialize_parse_v4_connect,
Expand Down Expand Up @@ -105,6 +109,12 @@ init_per_group(_Group, Config) ->
end_per_group(_Group, _Config) ->
ok.

t_parse_frame_malformed_variable_byte_integer(_) ->
MalformedPayload = << <<16#80>> || _ <- lists:seq(1, 6) >>,
ParseState = emqx_frame:initial_parse_state(#{}),
?assertError(malformed_variable_byte_integer,
emqx_frame:parse(MalformedPayload, ParseState)).

serialize_parse_connect(_) ->
Packet1 = ?CONNECT_PACKET(#mqtt_packet_connect{}),
?assertEqual(Packet1, parse_serialize(Packet1)),
Expand Down

0 comments on commit 587aabd

Please sign in to comment.