mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly synced 2024-11-22 23:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(AclFamily): commands parsing and error handling (#1726)

Browse Source 
* Fixed broken ACL command (prev df crashed)
* Fixed broken ACL LIST STR (now prints error)
* Added tests
This commit is contained in:
Kostas Kyrimis 2023-08-23 14:23:41 +03:00 committed by GitHub
parent 74fcd3ed06
commit 7f89bf37d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/acl/acl_family.cc
View File

@ -37,6 +37,10 @@ static std::string AclToString(uint32_t acl_category) {
return tmp;
}
void AclFamily::Acl(CmdArgList args, ConnectionContext* cntx) {
(*cntx)->SendError("Wrong number of arguments for acl command");
}
void AclFamily::List(CmdArgList args, ConnectionContext* cntx) {
const auto registry_with_lock = ServerState::tlocal()->user_registry->GetRegistryWithLock();
const auto& registry = registry_with_lock.registry;
@ -69,7 +73,8 @@ using CI = dfly::CommandId;
// easy to handle that case explicitly in `DispatchCommand`.
void AclFamily::Register(dfly::CommandRegistry* registry) {
*registry << CI{"ACL LIST", CO::ADMIN | CO::NOSCRIPT | CO::LOADING, 0, 0, 0, 0, acl::kList}.HFUNC(
*registry << CI{"ACL", CO::NOSCRIPT | CO::LOADING, 0, 0, 0, 0, acl::kList}.HFUNC(Acl);
*registry << CI{"ACL LIST", CO::ADMIN | CO::NOSCRIPT | CO::LOADING, 1, 0, 0, 0, acl::kList}.HFUNC(
List);
}

1
src/server/acl/acl_family.h
View File

@ -17,6 +17,7 @@ class AclFamily {
static void Register(CommandRegistry* registry);
private:
static void Acl(CmdArgList args, ConnectionContext* cntx);
static void List(CmdArgList args, ConnectionContext* cntx);
};

3
src/server/main_service.cc
View File

@ -1481,6 +1481,9 @@ static std::string FullAclCommandFromArgs(CmdArgList args) {
std::pair<const CommandId*, CmdArgList> Service::FindCmd(CmdArgList args) const {
const std::string_view command = facade::ToSV(args[0]);
if (command == "ACL") {
if (args.size() == 1) {
return {registry_.Find(ArgS(args, 0)), args};
}
return {registry_.Find(FullAclCommandFromArgs(args)), args.subspan(2)};
}

9
tests/dragonfly/acl_family_test.py
View File

@ -1,4 +1,5 @@
import pytest
import redis
from redis import asyncio as aioredis
from . import DflyInstanceFactory
from .utility import disconnect_clients
@ -9,6 +10,14 @@ async def test_acl_list_default_user(async_client):
"""
make sure that the default created user is printed correctly
"""
# Bad input
with pytest.raises(redis.exceptions.ResponseError):
await async_client.execute_command("ACL LIST TEMP")
with pytest.raises(redis.exceptions.ResponseError):
await async_client.execute_command("ACL")
result = await async_client.execute_command("ACL LIST")
assert 1 == len(result)
assert "user default on nopass +@all" == result[0]