mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
Deny commands flagged as REDIS_CMD_NOSCRIPT from Lua scripts
This commit is contained in:
parent
b60ed6e812
commit
15ef605340
@ -125,7 +125,7 @@ struct redisCommand redisCommandTable[] = {
|
||||
{"smove",smoveCommand,4,"w",0,NULL,1,2,1,0,0},
|
||||
{"sismember",sismemberCommand,3,"r",0,NULL,1,1,1,0,0},
|
||||
{"scard",scardCommand,2,"r",0,NULL,1,1,1,0,0},
|
||||
{"spop",spopCommand,2,"wR",0,NULL,1,1,1,0,0},
|
||||
{"spop",spopCommand,2,"wRs",0,NULL,1,1,1,0,0},
|
||||
{"srandmember",srandmemberCommand,2,"rR",0,NULL,1,1,1,0,0},
|
||||
{"sinter",sinterCommand,-2,"r",0,NULL,1,-1,1,0,0},
|
||||
{"sinterstore",sinterstoreCommand,-3,"wm",0,NULL,2,-1,1,0,0},
|
||||
|
@ -158,24 +158,29 @@ int luaRedisCommand(lua_State *lua) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Setup our fake client for command execution */
|
||||
c->argv = argv;
|
||||
c->argc = argc;
|
||||
|
||||
/* Command lookup */
|
||||
cmd = lookupCommand(argv[0]->ptr);
|
||||
if (!cmd || ((cmd->arity > 0 && cmd->arity != argc) ||
|
||||
(argc < -cmd->arity)))
|
||||
{
|
||||
for (j = 0; j < argc; j++) decrRefCount(argv[j]);
|
||||
zfree(argv);
|
||||
if (cmd)
|
||||
luaPushError(lua,
|
||||
"Wrong number of args calling Redis command From Lua script");
|
||||
else
|
||||
luaPushError(lua,"Unknown Redis command called from Lua script");
|
||||
return 1;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* Run the command in the context of a fake client */
|
||||
c->argv = argv;
|
||||
c->argc = argc;
|
||||
if (cmd->flags & REDIS_CMD_NOSCRIPT) {
|
||||
luaPushError(lua, "This Redis command is not allowed from scripts");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* Run the command */
|
||||
cmd->proc(c);
|
||||
|
||||
/* Convert the result of the Redis command into a suitable Lua type.
|
||||
@ -195,6 +200,7 @@ int luaRedisCommand(lua_State *lua) {
|
||||
redisProtocolToLuaType(lua,reply);
|
||||
sdsfree(reply);
|
||||
|
||||
cleanup:
|
||||
/* Clean up. Command code may have changed argv/argc so we use the
|
||||
* argv/argc of the client instead of the local variables. */
|
||||
for (j = 0; j < c->argc; j++)
|
||||
|
Loading…
x
Reference in New Issue
Block a user