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

ACL: ACLLoadFromFile(): several errors fixed to make it work.

Browse Source
This commit is contained in:
antirez 2019-02-07 17:07:35 +01:00
parent d26c9b5307
commit db30727547
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/acl.c
View File

@ -1141,8 +1141,8 @@ sds ACLLoadFromFile(const char *filename) {
argv = sdssplitargs(lines[i],&argc); argv = sdssplitargs(lines[i],&argc);
if (argv == NULL) { if (argv == NULL) {
errors = sdscatprintf(errors, errors = sdscatprintf(errors,
"%d: unbalanced quotes in acl line. ", "%s:%d: unbalanced quotes in acl line. ",
linenum); server.acl_filename, linenum);
continue; continue;
} }
@ -1155,8 +1155,8 @@ sds ACLLoadFromFile(const char *filename) {
/* The line should start with the "user" keyword. */ /* The line should start with the "user" keyword. */
if (strcmp(argv[0],"user") || argc < 2) { if (strcmp(argv[0],"user") || argc < 2) {
errors = sdscatprintf(errors, errors = sdscatprintf(errors,
"%d: line should start with user keyword followed " "%s:%d should start with user keyword followed "
"by the username. ", "by the username. ", server.acl_filename,
linenum); linenum);
sdsfreesplitres(argv,argc); sdsfreesplitres(argv,argc);
continue; continue;
@ -1170,14 +1170,18 @@ sds ACLLoadFromFile(const char *filename) {
if (ACLSetUser(fakeuser,argv[j],sdslen(argv[j])) != C_OK) { if (ACLSetUser(fakeuser,argv[j],sdslen(argv[j])) != C_OK) {
char *errmsg = ACLSetUserStringError(); char *errmsg = ACLSetUserStringError();
errors = sdscatprintf(errors, errors = sdscatprintf(errors,
"%d: error in ACL: %s. ", "%s:%d: %s. ",
linenum, errmsg); server.acl_filename, linenum, errmsg);
continue; continue;
} }
} }
if (j != argc) {
/* Apply the rule to the new users set only if so far there
* are no errors, otherwise it's useless since we are going
* to discard the new users set anyway. */
if (sdslen(errors) != 0) {
sdsfreesplitres(argv,argc); sdsfreesplitres(argv,argc);
continue; /* Error in ACL rules, don't apply. */ continue;
} }
/* We can finally lookup the user and apply the rule. If the /* We can finally lookup the user and apply the rule. If the
@ -1192,7 +1196,7 @@ sds ACLLoadFromFile(const char *filename) {
/* Note that the same rules already applied to the fake user, so /* Note that the same rules already applied to the fake user, so
* we just assert that everything goess well: it should. */ * we just assert that everything goess well: it should. */
for (j = 2; j < argc; j++) for (j = 2; j < argc; j++)
serverAssert(ACLSetUser(fakeuser,argv[j],sdslen(argv[j])) == C_OK); serverAssert(ACLSetUser(u,argv[j],sdslen(argv[j])) == C_OK);
sdsfreesplitres(argv,argc); sdsfreesplitres(argv,argc);
} }