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

ACL: return error when adding subcommands of fully added commands.

Browse Source 
It's almost certainly an error from the user side.
This commit is contained in:
antirez 2019-01-30 08:25:08 +01:00
parent 9c2e64db9c
commit 36a0168cfd
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/acl.c
View File

@ -485,7 +485,10 @@ void ACLAddAllowedSubcommand(user *u, unsigned long id, const char *sub) {
* *
* EINVAL: The specified opcode is not understood. * EINVAL: The specified opcode is not understood.
* ENOENT: The command name or command category provided with + or - is not * ENOENT: The command name or command category provided with + or - is not
* known. */ * known.
* EBUSY: The subcommand you want to add is about a command that is currently
* fully added.
*/
int ACLSetUser(user *u, const char *op, ssize_t oplen) { int ACLSetUser(user *u, const char *op, ssize_t oplen) {
if (oplen == -1) oplen = strlen(op); if (oplen == -1) oplen = strlen(op);
if (!strcasecmp(op,"on")) { if (!strcasecmp(op,"on")) {
@ -568,6 +571,15 @@ int ACLSetUser(user *u, const char *op, ssize_t oplen) {
return C_ERR; return C_ERR;
} }
/* The command should not be set right now in the command
* bitmap, because adding a subcommand of a fully added
* command is probably an error on the user side. */
if (ACLGetUserCommandBit(u,id) == 1) {
zfree(copy);
errno = EBUSY;
return C_ERR;
}
/* Add the subcommand to the list of valid ones. */ /* Add the subcommand to the list of valid ones. */
ACLAddAllowedSubcommand(u,id,sub); ACLAddAllowedSubcommand(u,id,sub);
@ -809,6 +821,10 @@ void aclCommand(client *c) {
errmsg = "unknown command or category name in ACL"; errmsg = "unknown command or category name in ACL";
else if (errno == EINVAL) else if (errno == EINVAL)
errmsg = "syntax error"; errmsg = "syntax error";
else if (errno == EBUSY)
errmsg = "adding a subcommand of a command already fully "
"added is not allowed. Remove the command to start. "
"Example: -DEBUG +DEBUG|DIGEST";
addReplyErrorFormat(c, addReplyErrorFormat(c,
"Error in ACL SETUSER modifier '%s': %s", "Error in ACL SETUSER modifier '%s': %s",
(char*)c->argv[j]->ptr, errmsg); (char*)c->argv[j]->ptr, errmsg);