Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
66eeaed9
R
Rocketmq
项目概览
小五666\n哈哈
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
66eeaed9
编写于
7月 24, 2021
作者:
Y
yuz10
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3175 check acl config before update. otherwise broker may fail to start
上级
36e6687d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
21 addition
and
6 deletion
+21
-6
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
...org/apache/rocketmq/acl/plain/PlainPermissionManager.java
+11
-6
acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
...g/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
+10
-0
未找到文件。
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
浏览文件 @
66eeaed9
...
@@ -130,6 +130,7 @@ public class PlainPermissionManager {
...
@@ -130,6 +130,7 @@ public class PlainPermissionManager {
log
.
error
(
"Parameter value plainAccessConfig is null,Please check your parameter"
);
log
.
error
(
"Parameter value plainAccessConfig is null,Please check your parameter"
);
throw
new
AclException
(
"Parameter value plainAccessConfig is null, Please check your parameter"
);
throw
new
AclException
(
"Parameter value plainAccessConfig is null, Please check your parameter"
);
}
}
checkPlainAccessConfig
(
plainAccessConfig
);
Permission
.
checkResourcePerms
(
plainAccessConfig
.
getTopicPerms
());
Permission
.
checkResourcePerms
(
plainAccessConfig
.
getTopicPerms
());
Permission
.
checkResourcePerms
(
plainAccessConfig
.
getGroupPerms
());
Permission
.
checkResourcePerms
(
plainAccessConfig
.
getGroupPerms
());
...
@@ -357,7 +358,7 @@ public class PlainPermissionManager {
...
@@ -357,7 +358,7 @@ public class PlainPermissionManager {
this
.
globalWhiteRemoteAddressStrategy
.
clear
();
this
.
globalWhiteRemoteAddressStrategy
.
clear
();
}
}
public
PlainAccessResource
buildPlainAccessResource
(
PlainAccessConfig
plainAccessConfig
)
throws
AclException
{
public
void
checkPlainAccessConfig
(
PlainAccessConfig
plainAccessConfig
)
throws
AclException
{
if
(
plainAccessConfig
.
getAccessKey
()
==
null
if
(
plainAccessConfig
.
getAccessKey
()
==
null
||
plainAccessConfig
.
getSecretKey
()
==
null
||
plainAccessConfig
.
getSecretKey
()
==
null
||
plainAccessConfig
.
getAccessKey
().
length
()
<=
AclConstants
.
ACCESS_KEY_MIN_LENGTH
||
plainAccessConfig
.
getAccessKey
().
length
()
<=
AclConstants
.
ACCESS_KEY_MIN_LENGTH
...
@@ -366,6 +367,10 @@ public class PlainPermissionManager {
...
@@ -366,6 +367,10 @@ public class PlainPermissionManager {
"The accessKey=%s and secretKey=%s cannot be null and length should longer than 6"
,
"The accessKey=%s and secretKey=%s cannot be null and length should longer than 6"
,
plainAccessConfig
.
getAccessKey
(),
plainAccessConfig
.
getSecretKey
()));
plainAccessConfig
.
getAccessKey
(),
plainAccessConfig
.
getSecretKey
()));
}
}
}
public
PlainAccessResource
buildPlainAccessResource
(
PlainAccessConfig
plainAccessConfig
)
throws
AclException
{
checkPlainAccessConfig
(
plainAccessConfig
);
PlainAccessResource
plainAccessResource
=
new
PlainAccessResource
();
PlainAccessResource
plainAccessResource
=
new
PlainAccessResource
();
plainAccessResource
.
setAccessKey
(
plainAccessConfig
.
getAccessKey
());
plainAccessResource
.
setAccessKey
(
plainAccessConfig
.
getAccessKey
());
plainAccessResource
.
setSecretKey
(
plainAccessConfig
.
getSecretKey
());
plainAccessResource
.
setSecretKey
(
plainAccessConfig
.
getSecretKey
());
...
...
acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
浏览文件 @
66eeaed9
...
@@ -566,6 +566,16 @@ public class PlainAccessValidatorTest {
...
@@ -566,6 +566,16 @@ public class PlainAccessValidatorTest {
plainAccessValidator
.
updateAccessConfig
(
plainAccessConfig
);
plainAccessValidator
.
updateAccessConfig
(
plainAccessConfig
);
}
}
@Test
(
expected
=
AclException
.
class
)
public
void
createAndUpdateAccessAclNullSkExceptionTest
()
{
PlainAccessConfig
plainAccessConfig
=
new
PlainAccessConfig
();
plainAccessConfig
.
setAccessKey
(
"RocketMQ33"
);
// secret key is null
PlainAccessValidator
plainAccessValidator
=
new
PlainAccessValidator
();
plainAccessValidator
.
updateAccessConfig
(
plainAccessConfig
);
}
@Test
@Test
public
void
updateGlobalWhiteAddrsNormalTest
()
{
public
void
updateGlobalWhiteAddrsNormalTest
()
{
System
.
setProperty
(
"rocketmq.home.dir"
,
"src/test/resources"
);
System
.
setProperty
(
"rocketmq.home.dir"
,
"src/test/resources"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录