mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat(acl): add acl keys to acl log command (#2274)

Browse source 
* add acl keys to acl log command
* add tests
This commit is contained in:
Kostas Kyrimis 2023-12-12 17:00:41 +02:00 • committed by GitHub
parent d88b2422de
commit 8640edad71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/server/acl/validator.cc
View file

@ -23,13 +23,12 @@ namespace dfly::acl {
return true;
}
const auto is_authed = IsUserAllowedToInvokeCommandGeneric(cntx.acl_categories, cntx.acl_commands,
cntx.keys, tail_args, id);
const auto [is_authed, reason] = IsUserAllowedToInvokeCommandGeneric(
cntx.acl_categories, cntx.acl_commands, cntx.keys, tail_args, id);
if (!is_authed) {
auto& log = ServerState::tlocal()->acl_log;
using Reason = acl::AclLog::Reason;
log.Add(cntx, std::string(id.name()), Reason::COMMAND);
log.Add(cntx, std::string(id.name()), reason);
}
return is_authed;
@ -39,10 +38,9 @@ namespace dfly::acl {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
[[nodiscard]] bool IsUserAllowedToInvokeCommandGeneric(uint32_t acl_cat,
const std::vector<uint64_t>& acl_commands,
const AclKeys& keys, CmdArgList tail_args,
const CommandId& id) {
[[nodiscard]] std::pair<bool, AclLog::Reason> IsUserAllowedToInvokeCommandGeneric(
uint32_t acl_cat, const std::vector<uint64_t>& acl_commands, const AclKeys& keys,
CmdArgList tail_args, const CommandId& id) {
const auto cat_credentials = id.acl_categories();
const size_t index = id.GetFamily();
const uint64_t command_mask = id.GetBitIndex();
@ -52,7 +50,7 @@ namespace dfly::acl {
(acl_cat & cat_credentials) != 0 || (acl_commands[index] & command_mask) != 0;
if (!command) {
return false;
return {false, AclLog::Reason::COMMAND};
}
auto match = [](const auto& pattern, const auto& target) {
@ -97,7 +95,7 @@ namespace dfly::acl {
}
}
return keys_allowed;
return {keys_allowed, AclLog::Reason::KEY};
}
#pragma GCC diagnostic pop