Skip to content

For 4.2.2: Use erl_parse:parse_term/1 to parse LDAP queries (backport #14960) #14962

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
merged 1 commit into from
Nov 20, 2025
Merged

For 4.2.2: Use erl_parse:parse_term/1 to parse LDAP queries (backport #14960) #14962

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
35 changes: 16 additions & 19 deletions deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap_util.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,40 +49,37 @@ fixup_query(false, Query) ->
Query ++ ".".

parse_query_handle_erl_scan({ok, Tokens, _EndLine}) ->
parse_query_handle_exprs(erl_parse:parse_exprs(Tokens));
parse_query_handle_parse_term(erl_parse:parse_term(Tokens));
parse_query_handle_erl_scan(Error) ->
cuttlefish:invalid(fmt("invalid query: ~tp", [Error])).

parse_query_handle_exprs({ok, AbsForm}) ->
parse_query_handle_eval(erl_eval:exprs(AbsForm, erl_eval:new_bindings()));
parse_query_handle_exprs(Error) ->
cuttlefish:invalid(fmt("invalid query: ~tp", [Error])).

parse_query_handle_eval({value, {constant, true}=T, _}) ->
parse_query_handle_parse_term({ok, {constant, true}=T}) ->
T;
parse_query_handle_eval({value, {constant, false}=T, _}) ->
parse_query_handle_parse_term({ok, {constant, false}=T}) ->
T;
parse_query_handle_eval({value, {in_group, _}=T, _}) ->
parse_query_handle_parse_term({ok, {in_group, _}=T}) ->
T;
parse_query_handle_eval({value, {in_group_nested, _, _}=T, _}) ->
parse_query_handle_parse_term({ok, {in_group_nested, _, _}=T}) ->
T;
parse_query_handle_eval({value, {for, Q}=T, _}) when is_list(Q) ->
parse_query_handle_parse_term({ok, {for, Q}=T}) when is_list(Q) ->
T;
parse_query_handle_eval({value, {'not', _}=T, _}) ->
parse_query_handle_parse_term({ok, {'not', _}=T}) ->
T;
parse_query_handle_eval({value, {'and', Q}=T, _}) when is_list(Q) ->
parse_query_handle_parse_term({ok, {'and', Q}=T}) when is_list(Q) ->
T;
parse_query_handle_eval({value, {'or', Q}=T, _}) when is_list(Q) ->
parse_query_handle_parse_term({ok, {'or', Q}=T}) when is_list(Q) ->
T;
parse_query_handle_eval({value, {equals, _, _}=T, _}) ->
parse_query_handle_parse_term({ok, {equals, _, _}=T}) ->
T;
parse_query_handle_eval({value, {match, _, _}=T, _}) ->
parse_query_handle_parse_term({ok, {match, _, _}=T}) ->
T;
parse_query_handle_eval({value, T, _}) when is_list(T) ->
parse_query_handle_parse_term({ok, T}) when is_list(T) ->
%% NB: tag_queries uses this form
T;
parse_query_handle_eval({value, Unexpected, _}) ->
cuttlefish:invalid(fmt("invalid query: ~tp", [Unexpected])).
parse_query_handle_parse_term({ok, {value, Unexpected, _}}) ->
cuttlefish:invalid(fmt("invalid query: ~tp", [Unexpected]));
parse_query_handle_parse_term({error, ErrorInfo}) ->
cuttlefish:invalid(fmt("invalid query: ~tp", [ErrorInfo])).

fmt(Fmt, Args) ->
rabbit_data_coercion:to_unicode_charlist(io_lib:format(Fmt, Args)).
Loading