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

feat(acl): add config set for acllog_max_len (#1979)

Browse source
This commit is contained in:
iko1 2023-10-29 18:17:02 +02:00 • committed by GitHub
parent 1538f66a35
commit ac170748fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/acl/acl_family.cc
View file

@ -618,6 +618,15 @@ void AclFamily::Init(facade::Listener* main_listener, UserRegistry* registry) {
}
registry_->Init();
config_registry.RegisterMutable("aclfile");
config_registry.RegisterMutable("acllog_max_len", [this](const absl::CommandLineFlag& flag) {
auto res = flag.TryGet<size_t>();
if (res.has_value()) {
pool_->AwaitFiberOnAll([&res](auto index, auto* context) {
ServerState::tlocal()->acl_log.SetTotalEntries(res.value());
});
}
return res.has_value();
});
}
} // namespace dfly::acl

8
src/server/acl/acl_log.cc
View file

@ -55,4 +55,12 @@ AclLog::LogType AclLog::GetLog(size_t number_of_entries) const {
return {start, end};
}
void AclLog::SetTotalEntries(size_t total_entries) {
if (log_.size() > total_entries) {
log_.erase(std::next(log_.begin(), total_entries), log_.end());
}
total_entries_allowed_ = total_entries;
}
} // namespace dfly::acl

4
src/server/acl/acl_log.h
View file

@ -42,9 +42,11 @@ class AclLog {
LogType GetLog(size_t number_of_entries) const;
void SetTotalEntries(size_t total_entries);
private:
LogType log_;
const size_t total_entries_allowed_;
size_t total_entries_allowed_;
};
} // namespace dfly::acl

30
tests/dragonfly/acl_family_test.py
View file

@ -439,3 +439,33 @@ async def test_set_acl_file(async_client: aioredis.Redis, tmp_dir):
result = await async_client.execute_command("AUTH roy mypass")
assert result == "OK"
@pytest.mark.asyncio
@dfly_args({"proactor_threads": 1})
async def test_set_len_acl_log(async_client):
res = await async_client.execute_command("ACL LOG")
assert [] == res
await async_client.execute_command("ACL SETUSER elon >mars ON +@string +@dangerous")
for x in range(7):
with pytest.raises(redis.exceptions.AuthenticationError):
await async_client.execute_command("AUTH elon wrong")
res = await async_client.execute_command("ACL LOG")
assert 7 == len(res)
await async_client.execute_command(f"CONFIG SET acllog_max_len 3")
res = await async_client.execute_command("ACL LOG")
assert 3 == len(res)
await async_client.execute_command(f"CONFIG SET acllog_max_len 10")
for x in range(7):
with pytest.raises(redis.exceptions.AuthenticationError):
await async_client.execute_command("AUTH elon wrong")
res = await async_client.execute_command("ACL LOG")
assert 10 == len(res)