fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 08:41:04 +00:00
Code Issues Projects Releases Wiki Activity

ACL: fix command bit check.

Browse Source
This commit is contained in:
antirez 2019-01-26 12:51:43 +01:00
parent b7750a936f
commit af72a31490
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/acl.c
View File

@ -160,10 +160,10 @@ user *ACLCreateUser(const char *name, size_t namelen) {
* so that user->allowed_commands[word]&bit will identify that specific * so that user->allowed_commands[word]&bit will identify that specific
* bit. The function returns C_ERR in case the specified ID overflows * bit. The function returns C_ERR in case the specified ID overflows
* the bitmap in the user representation. */ * the bitmap in the user representation. */
int ACLGetCommandBitCoordinates(unsigned long id, uint64_t *word, uint64_t *bit) { int ACLGetCommandBitCoordinates(uint64_t id, uint64_t *word, uint64_t *bit) {
if (id >= USER_COMMAND_BITS_COUNT) return C_ERR; if (id >= USER_COMMAND_BITS_COUNT) return C_ERR;
*word = id / sizeof(uint64_t) / 8; *word = id / sizeof(uint64_t) / 8;
*bit = 1 << (id % (sizeof(uint64_t) * 8)); *bit = 1ULL << (id % (sizeof(uint64_t) * 8));
return C_OK; return C_OK;
} }
@ -177,7 +177,7 @@ int ACLGetCommandBitCoordinates(unsigned long id, uint64_t *word, uint64_t *bit)
int ACLGetUserCommandBit(user *u, unsigned long id) { int ACLGetUserCommandBit(user *u, unsigned long id) {
uint64_t word, bit; uint64_t word, bit;
if (ACLGetCommandBitCoordinates(id,&word,&bit) == C_ERR) return 0; if (ACLGetCommandBitCoordinates(id,&word,&bit) == C_ERR) return 0;
return u->allowed_commands[word] & bit; return (u->allowed_commands[word] & bit) != 0;
} }
/* When +@all or allcommands is given, we set a reserved bit as well that we /* When +@all or allcommands is given, we set a reserved bit as well that we