gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't allow empty spaces in ACL key patterns.

Browse Source 
Fixes issue #6418.
This commit is contained in:
antirez 2020-04-15 16:12:06 +02:00
parent e8dd99fa53
commit 3519a5a026
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/acl.c
View File

@ -30,6 +30,7 @@
#include "server.h" #include "server.h"
#include "sha256.h" #include "sha256.h"
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h>
/* ============================================================================= /* =============================================================================
* Global state for ACLs * Global state for ACLs
@ -690,7 +691,8 @@ void ACLAddAllowedSubcommand(user *u, unsigned long id, const char *sub) {
* *
* When an error is returned, errno is set to the following values: * When an error is returned, errno is set to the following values:
* *
* EINVAL: The specified opcode is not understood. * EINVAL: The specified opcode is not understood or the key pattern is
* invalid (contains non allowed characters).
* 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 * EBUSY: The subcommand you want to add is about a command that is currently
@ -789,6 +791,15 @@ int ACLSetUser(user *u, const char *op, ssize_t oplen) {
errno = EEXIST; errno = EEXIST;
return C_ERR; return C_ERR;
} }
/* Validate the pattern: no spaces nor null characters
* are allowed, for simpler rewriting of the ACLs without
* using quoting. */
for (int i = 1; i < oplen; i++) {
if (isspace(op[i]) || op[i] == 0) {
errno = EINVAL;
return C_ERR;
}
}
sds newpat = sdsnewlen(op+1,oplen-1); sds newpat = sdsnewlen(op+1,oplen-1);
listNode *ln = listSearchKey(u->patterns,newpat); listNode *ln = listSearchKey(u->patterns,newpat);
/* Avoid re-adding the same pattern multiple times. */ /* Avoid re-adding the same pattern multiple times. */