fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

ACL: return error when removing a non existing password.

Browse Source 
Otherwise it's very simple for an human mistake to think a password is
removed because of a typo in the ACL SETUSER myuser <somepass command
line.
This commit is contained in:
antirez 2019-02-11 17:00:51 +01:00
parent f8a6132f15
commit f0c7cfa459
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/acl.c
View File

@ -661,6 +661,7 @@ void ACLAddAllowedSubcommand(user *u, unsigned long id, const char *sub) {
* fully added. * fully added.
* EEXIST: You are adding a key pattern after "*" was already added. This is * EEXIST: You are adding a key pattern after "*" was already added. This is
* almost surely an error on the user side. * almost surely an error on the user side.
* ENODEV: The password you are trying to remove from the user does not exist.
*/ */
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);
@ -705,8 +706,13 @@ int ACLSetUser(user *u, const char *op, ssize_t oplen) {
} else if (op[0] == '<') { } else if (op[0] == '<') {
sds delpass = sdsnewlen(op+1,oplen-1); sds delpass = sdsnewlen(op+1,oplen-1);
listNode *ln = listSearchKey(u->passwords,delpass); listNode *ln = listSearchKey(u->passwords,delpass);
if (ln) listDelNode(u->passwords,ln);
sdsfree(delpass); sdsfree(delpass);
if (ln) {
listDelNode(u->passwords,ln);
} else {
errno = ENODEV;
return C_ERR;
}
} else if (op[0] == '~') { } else if (op[0] == '~') {
if (u->flags & USER_FLAG_ALLKEYS) { if (u->flags & USER_FLAG_ALLKEYS) {
errno = EEXIST; errno = EEXIST;
@ -810,6 +816,9 @@ char *ACLSetUserStringError(void) {
"'allkeys' flag) is not valid and does not have any " "'allkeys' flag) is not valid and does not have any "
"effect. Try 'resetkeys' to start with an empty " "effect. Try 'resetkeys' to start with an empty "
"list of patterns"; "list of patterns";
else if (errno == ENODEV)
errmsg = "The password you are trying to remove from the user does "
"not exist";
return errmsg; return errmsg;
} }