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

Deny commands flagged as REDIS_CMD_NOSCRIPT from Lua scripts

Browse Source
This commit is contained in:
antirez 2011-09-27 13:57:10 +02:00
parent b60ed6e812
commit 15ef605340
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.c
View File

@ -125,7 +125,7 @@ struct redisCommand redisCommandTable[] = {
{"smove",smoveCommand,4,"w",0,NULL,1,2,1,0,0}, {"smove",smoveCommand,4,"w",0,NULL,1,2,1,0,0},
{"sismember",sismemberCommand,3,"r",0,NULL,1,1,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}, {"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}, {"srandmember",srandmemberCommand,2,"rR",0,NULL,1,1,1,0,0},
{"sinter",sinterCommand,-2,"r",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}, {"sinterstore",sinterstoreCommand,-3,"wm",0,NULL,2,-1,1,0,0},

18
src/scripting.c
View File

@ -158,24 +158,29 @@ int luaRedisCommand(lua_State *lua) {
return 1; return 1;
} }
/* Setup our fake client for command execution */
c->argv = argv;
c->argc = argc;
/* Command lookup */ /* Command lookup */
cmd = lookupCommand(argv[0]->ptr); cmd = lookupCommand(argv[0]->ptr);
if (!cmd || ((cmd->arity > 0 && cmd->arity != argc) || if (!cmd || ((cmd->arity > 0 && cmd->arity != argc) ||
(argc < -cmd->arity))) (argc < -cmd->arity)))
{ {
for (j = 0; j < argc; j++) decrRefCount(argv[j]);
zfree(argv);
if (cmd) if (cmd)
luaPushError(lua, luaPushError(lua,
"Wrong number of args calling Redis command From Lua script"); "Wrong number of args calling Redis command From Lua script");
else else
luaPushError(lua,"Unknown Redis command called from Lua script"); luaPushError(lua,"Unknown Redis command called from Lua script");
return 1; goto cleanup;
} }
/* Run the command in the context of a fake client */ if (cmd->flags & REDIS_CMD_NOSCRIPT) {
c->argv = argv; luaPushError(lua, "This Redis command is not allowed from scripts");
c->argc = argc; goto cleanup;
}
/* Run the command */
cmd->proc(c); cmd->proc(c);
/* Convert the result of the Redis command into a suitable Lua type. /* Convert the result of the Redis command into a suitable Lua type.
@ -195,6 +200,7 @@ int luaRedisCommand(lua_State *lua) {
redisProtocolToLuaType(lua,reply); redisProtocolToLuaType(lua,reply);
sdsfree(reply); sdsfree(reply);
cleanup:
/* Clean up. Command code may have changed argv/argc so we use the /* Clean up. Command code may have changed argv/argc so we use the
* argv/argc of the client instead of the local variables. */ * argv/argc of the client instead of the local variables. */
for (j = 0; j < c->argc; j++) for (j = 0; j < c->argc; j++)