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

XREAD and XREADGROUP should not be allowed from scripts when BLOCK option is being used

Browse Source
This commit is contained in:
Valentino Geron 2020-03-26 11:49:21 +02:00
parent c4d7f30e25
commit 9a1843ef2d
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -947,11 +947,11 @@ struct redisCommand redisCommandTable[] = {
0,NULL,1,1,1,0,0,0}, 0,NULL,1,1,1,0,0,0},
{"xread",xreadCommand,-4, {"xread",xreadCommand,-4,
"read-only no-script @stream @blocking", "read-only @stream @blocking",
0,xreadGetKeys,1,1,1,0,0,0}, 0,xreadGetKeys,1,1,1,0,0,0},
{"xreadgroup",xreadCommand,-7, {"xreadgroup",xreadCommand,-7,
"write no-script @stream @blocking", "write @stream @blocking",
0,xreadGetKeys,1,1,1,0,0,0}, 0,xreadGetKeys,1,1,1,0,0,0},
{"xgroup",xgroupCommand,-2, {"xgroup",xgroupCommand,-2,

5
src/t_stream.c
View File

@ -1373,6 +1373,11 @@ void xreadCommand(client *c) {
int moreargs = c->argc-i-1; int moreargs = c->argc-i-1;
char *o = c->argv[i]->ptr; char *o = c->argv[i]->ptr;
if (!strcasecmp(o,"BLOCK") && moreargs) { if (!strcasecmp(o,"BLOCK") && moreargs) {
if (c->flags & CLIENT_LUA) {
/* There is no sense to use BLOCK option within LUA */
addReplyErrorFormat(c, "%s command is not allowed with BLOCK option from scripts", (char *)c->argv[0]->ptr);
return;
}
i++; i++;
if (getTimeoutFromObjectOrReply(c,c->argv[i],&timeout, if (getTimeoutFromObjectOrReply(c,c->argv[i],&timeout,
UNIT_MILLISECONDS) != C_OK) return; UNIT_MILLISECONDS) != C_OK) return;

11
tests/unit/scripting.tcl
View File

@ -146,6 +146,17 @@ start_server {tags {"scripting"}} {
set e set e
} {*not allowed*} } {*not allowed*}
test {EVAL - Scripts can't run XREAD and XREADGROUP with BLOCK option} {
r del s
r xgroup create s g $ MKSTREAM
set res [r eval {return redis.pcall('xread','STREAMS','s','$')} 1 s]
assert {$res eq {}}
assert_error "*xread command is not allowed with BLOCK option from scripts" {r eval {return redis.pcall('xread','BLOCK',0,'STREAMS','s','$')} 1 s}
set res [r eval {return redis.pcall('xreadgroup','group','g','c','STREAMS','s','>')} 1 s]
assert {$res eq {}}
assert_error "*xreadgroup command is not allowed with BLOCK option from scripts" {r eval {return redis.pcall('xreadgroup','group','g','c','BLOCK',0,'STREAMS','s','>')} 1 s}
}
test {EVAL - Scripts can't run certain commands} { test {EVAL - Scripts can't run certain commands} {
set e {} set e {}
r debug lua-always-replicate-commands 0 r debug lua-always-replicate-commands 0