Skip to content

Sort sources correctly so that 'all' comes last #46

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
martinsumner merged 2 commits into from
Jun 3, 2026
Merged

Sort sources correctly so that 'all' comes last #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a36b117
Sort sources correctly so that 'all' comes last
l2dy May 17, 2026
8b4ba8f
Sort user groups correctly so that 'all' comes last
l2dy May 22, 2026
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
14 changes: 7 additions & 7 deletions src/riak_core_security.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,15 +1085,15 @@ match_source([{UserName, {IP,Mask}, Source, Options}|Tail], User, PeerIP) ->

sort_sources(Sources) ->
%% sort sources first by userlist, so that 'all' matches come last
%% and then by CIDR, so that most sprcific masks come first
%% and then by CIDR, so that most specific masks come first
Sources1 = lists:sort(fun({UserA, _, _, _}, {UserB, _, _, _}) ->
case {UserA, UserB} of
{all, all} ->
true;
{all, _} ->
%% anything is greater than 'all'
true;
{_, all} ->
%% anything should come before 'all'
true;
{all, _} ->
false;
{_, _} ->
true
Expand Down Expand Up @@ -1129,10 +1129,10 @@ group_sources(Sources) ->
case {UserA, UserB} of
{[all], [all]} ->
true;
{[all], _} ->
%% anything is greater than 'all'
true;
{_, [all]} ->
%% anything should come before 'all'
true;
{[all], _} ->
false;
{_, _} ->
true
Expand Down
Loading