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

ACL LOG: also log ACL errors in the scripting/MULTI ctx.

Browse Source
This commit is contained in:
antirez 2020-01-30 10:50:32 +01:00
parent eef1489240
commit bc168c91ec
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/multi.c
View File

@ -177,8 +177,10 @@ void execCommand(client *c) {
must_propagate = 1; must_propagate = 1;
} }
int acl_retval = ACLCheckCommandPerm(c,NULL); int acl_keypos;
int acl_retval = ACLCheckCommandPerm(c,&acl_keypos);
if (acl_retval != ACL_OK) { if (acl_retval != ACL_OK) {
addACLLogEntry(c,acl_retval,acl_keypos);
addReplyErrorFormat(c, addReplyErrorFormat(c,
"-NOPERM ACLs rules changed between the moment the " "-NOPERM ACLs rules changed between the moment the "
"transaction was accumulated and the EXEC call. " "transaction was accumulated and the EXEC call. "

4
src/scripting.c
View File

@ -606,8 +606,10 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
} }
/* Check the ACLs. */ /* Check the ACLs. */
int acl_retval = ACLCheckCommandPerm(c,NULL); int acl_keypos;
int acl_retval = ACLCheckCommandPerm(c,&acl_keypos);
if (acl_retval != ACL_OK) { if (acl_retval != ACL_OK) {
addACLLogEntry(c,acl_retval,acl_keypos);
if (acl_retval == ACL_DENIED_CMD) if (acl_retval == ACL_DENIED_CMD)
luaPushError(lua, "The user executing the script can't run this " luaPushError(lua, "The user executing the script can't run this "
"command or subcommand"); "command or subcommand");