Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
fd7484cd
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fd7484cd
编写于
2月 13, 2019
作者:
S
Salvatore Sanfilippo
提交者:
GitHub
2月 13, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5836 from soloestoy/fix-acl-warning
ACL: show categories in COMMAND reply
上级
e819c2ef
14507457
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
src/acl.c
src/acl.c
+13
-1
src/server.c
src/server.c
+4
-2
src/server.h
src/server.h
+1
-0
未找到文件。
src/acl.c
浏览文件 @
fd7484cd
...
@@ -1446,7 +1446,7 @@ void aclCommand(client *c) {
...
@@ -1446,7 +1446,7 @@ void aclCommand(client *c) {
}
else
if
(
!
strcasecmp
(
sub
,
"cat"
)
&&
c
->
argc
==
3
)
{
}
else
if
(
!
strcasecmp
(
sub
,
"cat"
)
&&
c
->
argc
==
3
)
{
uint64_t
cflag
=
ACLGetCommandCategoryFlagByName
(
c
->
argv
[
2
]
->
ptr
);
uint64_t
cflag
=
ACLGetCommandCategoryFlagByName
(
c
->
argv
[
2
]
->
ptr
);
if
(
cflag
==
0
)
{
if
(
cflag
==
0
)
{
addReplyErrorFormat
(
c
,
"Unknown category '%s'"
,
c
->
argv
[
2
]
->
ptr
);
addReplyErrorFormat
(
c
,
"Unknown category '%s'"
,
(
char
*
)
c
->
argv
[
2
]
->
ptr
);
return
;
return
;
}
}
int
arraylen
=
0
;
int
arraylen
=
0
;
...
@@ -1480,3 +1480,15 @@ NULL
...
@@ -1480,3 +1480,15 @@ NULL
addReplySubcommandSyntaxError
(
c
);
addReplySubcommandSyntaxError
(
c
);
}
}
}
}
void
addReplyCommandCategories
(
client
*
c
,
struct
redisCommand
*
cmd
)
{
int
flagcount
=
0
;
void
*
flaglen
=
addReplyDeferredLen
(
c
);
for
(
int
j
=
0
;
ACLCommandCategories
[
j
].
flag
!=
0
;
j
++
)
{
if
(
cmd
->
flags
&
ACLCommandCategories
[
j
].
flag
)
{
addReplyStatusFormat
(
c
,
"@%s"
,
ACLCommandCategories
[
j
].
name
);
flagcount
++
;
}
}
setDeferredSetLen
(
c
,
flaglen
,
flagcount
);
}
src/server.c
浏览文件 @
fd7484cd
...
@@ -3698,8 +3698,8 @@ void addReplyCommand(client *c, struct redisCommand *cmd) {
...
@@ -3698,8 +3698,8 @@ void addReplyCommand(client *c, struct redisCommand *cmd) {
if
(
!
cmd
)
{
if
(
!
cmd
)
{
addReplyNull
(
c
);
addReplyNull
(
c
);
}
else
{
}
else
{
/* We are adding: command name, arg count, flags, first, last, offset */
/* We are adding: command name, arg count, flags, first, last, offset
, categories
*/
addReplyArrayLen
(
c
,
6
);
addReplyArrayLen
(
c
,
7
);
addReplyBulkCString
(
c
,
cmd
->
name
);
addReplyBulkCString
(
c
,
cmd
->
name
);
addReplyLongLong
(
c
,
cmd
->
arity
);
addReplyLongLong
(
c
,
cmd
->
arity
);
...
@@ -3729,6 +3729,8 @@ void addReplyCommand(client *c, struct redisCommand *cmd) {
...
@@ -3729,6 +3729,8 @@ void addReplyCommand(client *c, struct redisCommand *cmd) {
addReplyLongLong
(
c
,
cmd
->
firstkey
);
addReplyLongLong
(
c
,
cmd
->
firstkey
);
addReplyLongLong
(
c
,
cmd
->
lastkey
);
addReplyLongLong
(
c
,
cmd
->
lastkey
);
addReplyLongLong
(
c
,
cmd
->
keystep
);
addReplyLongLong
(
c
,
cmd
->
keystep
);
addReplyCommandCategories
(
c
,
cmd
);
}
}
}
}
...
...
src/server.h
浏览文件 @
fd7484cd
...
@@ -1748,6 +1748,7 @@ char *ACLSetUserStringError(void);
...
@@ -1748,6 +1748,7 @@ char *ACLSetUserStringError(void);
int
ACLLoadConfiguredUsers
(
void
);
int
ACLLoadConfiguredUsers
(
void
);
sds
ACLDescribeUser
(
user
*
u
);
sds
ACLDescribeUser
(
user
*
u
);
void
ACLLoadUsersAtStartup
(
void
);
void
ACLLoadUsersAtStartup
(
void
);
void
addReplyCommandCategories
(
client
*
c
,
struct
redisCommand
*
cmd
);
/* Sorted sets data type */
/* Sorted sets data type */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录