Skip to content

Match exact symbol length when detecting AMQP 1.0 body sections #17017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ansd merged 1 commit into from
Jul 23, 2026
+50 −6
Merged

Match exact symbol length when detecting AMQP 1.0 body sections #17017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions deps/amqp10_common/src/amqp10_binary_parser.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,17 @@ pm(<<?DESCRIBED, ?CODE_ULONG, ?DESCRIPTOR_CODE_AMQP_SEQUENCE:64, _Rest/binary>>,
reached_body(B, ?DESCRIPTOR_CODE_AMQP_SEQUENCE);
pm(<<?DESCRIBED, ?CODE_ULONG, ?DESCRIPTOR_CODE_AMQP_VALUE:64, _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_AMQP_VALUE);
pm(<<?DESCRIBED, ?CODE_SYM_8, _S:8, "amqp:data:binary", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_8, 16:8, "amqp:data:binary", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_DATA);
pm(<<?DESCRIBED, ?CODE_SYM_8, _S:8, "amqp:amqp-sequence:list", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_8, 23:8, "amqp:amqp-sequence:list", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_AMQP_SEQUENCE);
pm(<<?DESCRIBED, ?CODE_SYM_8, _S:8, "amqp:amqp-value:*", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_8, 17:8, "amqp:amqp-value:*", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_AMQP_VALUE);
pm(<<?DESCRIBED, ?CODE_SYM_32, _S:32, "amqp:data:binary", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_32, 16:32, "amqp:data:binary", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_DATA);
pm(<<?DESCRIBED, ?CODE_SYM_32, _S:32, "amqp:amqp-sequence:list", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_32, 23:32, "amqp:amqp-sequence:list", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_AMQP_SEQUENCE);
pm(<<?DESCRIBED, ?CODE_SYM_32, _S:32, "amqp:amqp-value:*", _Rest/binary>>, true, B) ->
pm(<<?DESCRIBED, ?CODE_SYM_32, 17:32, "amqp:amqp-value:*", _Rest/binary>>, true, B) ->
reached_body(B, ?DESCRIPTOR_CODE_AMQP_VALUE);
pm(<<?DESCRIBED, ?CODE_ULONG, ?DESCRIPTOR_CODE_PROPERTIES:64, Rest0/binary>>, O = true, B) ->
[Value | Rest] = pm(Rest0, O, B+10),
Expand Down
44 changes: 44 additions & 0 deletions deps/amqp10_common/test/binary_parser_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ all_tests() ->
array_of_zero_width_elements,
array_of_described_zero_width_elements_unsupported,
unsupported_type,
server_mode_symbolic_body_descriptors,
server_mode_body_descriptor_prefix_collision,
peek_described_section_total_sizes,
peek_described_section,
peek_non_described_throws,
Expand Down Expand Up @@ -166,6 +168,48 @@ unsupported_type(_Config) ->
Expected = {primitive_type_unsupported, UnsupportedType, {position, 0}},
?assertThrow(Expected, amqp10_binary_parser:parse_many(Bin, [])).

%% A symbolic body descriptor of the exact registered length is classified as
%% the corresponding standard body section in server_mode.
server_mode_symbolic_body_descriptors(_Config) ->
Data8 = <<0, 16#a3, 16, "amqp:data:binary", 16#a0, 1, "x">>,
Seq8 = <<0, 16#a3, 23, "amqp:amqp-sequence:list", 16#45>>,
Value8 = <<0, 16#a3, 17, "amqp:amqp-value:*", 16#a1, 1, "x">>,
?assertEqual([{{pos, 0}, {body, 16#75}}],
amqp10_binary_parser:parse_many(Data8, [server_mode])),
?assertEqual([{{pos, 0}, {body, 16#76}}],
amqp10_binary_parser:parse_many(Seq8, [server_mode])),
?assertEqual([{{pos, 0}, {body, 16#77}}],
amqp10_binary_parser:parse_many(Value8, [server_mode])),
%% The sym32 forms must be classified identically.
Data32 = <<0, 16#b3, 16:32, "amqp:data:binary", 16#a0, 1, "x">>,
Seq32 = <<0, 16#b3, 23:32, "amqp:amqp-sequence:list", 16#45>>,
Value32 = <<0, 16#b3, 17:32, "amqp:amqp-value:*", 16#a1, 1, "x">>,
?assertEqual([{{pos, 0}, {body, 16#75}}],
amqp10_binary_parser:parse_many(Data32, [server_mode])),
?assertEqual([{{pos, 0}, {body, 16#76}}],
amqp10_binary_parser:parse_many(Seq32, [server_mode])),
?assertEqual([{{pos, 0}, {body, 16#77}}],
amqp10_binary_parser:parse_many(Value32, [server_mode])).

server_mode_body_descriptor_prefix_collision(_Config) ->
%% Well-formed but unknown descriptor "amqp:data:binary@" (length 17).
Collision8 = <<0, 16#a3, 17, "amqp:data:binary", $@, 16#a0, 3, "abc">>,
?assertEqual(
[{described, {symbol, <<"amqp:data:binary@">>}, {binary, <<"abc">>}}],
amqp10_binary_parser:parse_many(Collision8, [server_mode])),

%% The same collision via the sym32 constructor.
Collision32 = <<0, 16#b3, 17:32, "amqp:data:binary", $@, 16#a0, 3, "abc">>,
?assertEqual(
[{described, {symbol, <<"amqp:data:binary@">>}, {binary, <<"abc">>}}],
amqp10_binary_parser:parse_many(Collision32, [server_mode])),

%% A prefix collision on the amqp-value descriptor.
ValueCollision = <<0, 16#a3, 18, "amqp:amqp-value:*!", 16#a1, 1, "x">>,
?assertEqual(
[{described, {symbol, <<"amqp:amqp-value:*!">>}, {utf8, <<"x">>}}],
amqp10_binary_parser:parse_many(ValueCollision, [server_mode])).

%%%===================================================================
%%% peek/1 (exercises peek_value_size internally via described types)
%%%===================================================================
Expand Down
Loading