caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACL: remove the ALLCOMMANDS user flag at a safer place.

Browse Source 
This fixes -@<category> as a side effect.
This commit is contained in:
antirez 2019-01-25 13:27:33 +01:00
parent eb840f9bc5
commit b7750a936f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/acl.c
View File

@ -189,9 +189,12 @@ int ACLUserCanExecuteFutureCommands(user *u) {
/* Set the specified command bit for the specified user to 'value' (0 or 1). /* Set the specified command bit for the specified user to 'value' (0 or 1).
* If the bit overflows the user internal represetation, no operation * If the bit overflows the user internal represetation, no operation
* is performed. */ * is performed. As a side effect of calling this function with a value of
* zero, the user flag ALLCOMMANDS is cleared since it is no longer possible
* to skip the command bit explicit test. */
void ACLSetUserCommandBit(user *u, unsigned long id, int value) { void ACLSetUserCommandBit(user *u, unsigned long id, int value) {
uint64_t word, bit; uint64_t word, bit;
if (value == 0) u->flags &= ~USER_FLAG_ALLCOMMANDS;
if (ACLGetCommandBitCoordinates(id,&word,&bit) == C_ERR) return; if (ACLGetCommandBitCoordinates(id,&word,&bit) == C_ERR) return;
if (value) if (value)
u->allowed_commands[word] |= bit; u->allowed_commands[word] |= bit;
@ -412,7 +415,6 @@ int ACLSetUser(user *u, const char *op, ssize_t oplen) {
} }
unsigned long id = ACLGetCommandID(op+1); unsigned long id = ACLGetCommandID(op+1);
ACLSetUserCommandBit(u,id,0); ACLSetUserCommandBit(u,id,0);
u->flags &= ~USER_FLAG_ALLCOMMANDS;
ACLResetSubcommandsForCommand(u,id); ACLResetSubcommandsForCommand(u,id);
} else if ((op[0] == '+' || op[0] == '-') && op[1] == '@') { } else if ((op[0] == '+' || op[0] == '-') && op[1] == '@') {
int bitval = op[0] == '+' ? 1 : 0; int bitval = op[0] == '+' ? 1 : 0;