Skip to content

fix(ACL): Fix the iteration over categories loop in AclToString #1731

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 2 commits into from
Aug 24, 2023
Merged

fix(ACL): Fix the iteration over categories loop in AclToString #1731

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
486fc9f
fix(ACL): Fix the iteration over categories loop in AclToString
royjacobson Aug 24, 2023
d3c8caa
Use another approach.
royjacobson Aug 24, 2023
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
4 changes: 2 additions & 2 deletions src/server/acl/acl_family.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ static std::string AclToString(uint32_t acl_category) {
const std::string prefix = "+@";
const std::string postfix = " ";

for (uint32_t step = 0, cat = 0; cat != JSON; cat = 1ULL << ++step) {
for (const auto& [cat_name, cat] : CATEGORY_INDEX_TABLE) {
if (acl_category & cat) {
absl::StrAppend(&tmp, prefix, REVERSE_CATEGORY_INDEX_TABLE[step], postfix);
absl::StrAppend(&tmp, prefix, cat_name, postfix);
}
}
tmp.erase(tmp.size());
Expand Down