Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
逝缘~
Rocketmq
提交
85168cd2
R
Rocketmq
项目概览
逝缘~
/
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,发现更多精彩内容 >>
提交
85168cd2
编写于
5月 14, 2021
作者:
S
shendong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the problem of potential NPE in ACL plain
上级
be6eaf85
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
18 deletion
+25
-18
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
...org/apache/rocketmq/acl/plain/PlainPermissionManager.java
+25
-18
未找到文件。
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
浏览文件 @
85168cd2
...
@@ -89,7 +89,7 @@ public class PlainPermissionManager {
...
@@ -89,7 +89,7 @@ public class PlainPermissionManager {
List
<
PlainAccessConfig
>
plainAccessConfigList
=
accounts
.
toJavaList
(
PlainAccessConfig
.
class
);
List
<
PlainAccessConfig
>
plainAccessConfigList
=
accounts
.
toJavaList
(
PlainAccessConfig
.
class
);
for
(
PlainAccessConfig
plainAccessConfig
:
plainAccessConfigList
)
{
for
(
PlainAccessConfig
plainAccessConfig
:
plainAccessConfigList
)
{
PlainAccessResource
plainAccessResource
=
buildPlainAccessResource
(
plainAccessConfig
);
PlainAccessResource
plainAccessResource
=
buildPlainAccessResource
(
plainAccessConfig
);
plainAccessResourceMap
.
put
(
plainAccessResource
.
getAccessKey
(),
plainAccessResource
);
plainAccessResourceMap
.
put
(
plainAccessResource
.
getAccessKey
(),
plainAccessResource
);
}
}
}
}
...
@@ -133,7 +133,9 @@ public class PlainPermissionManager {
...
@@ -133,7 +133,9 @@ public class PlainPermissionManager {
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
.
class
);
Map
.
class
);
if
(
aclAccessConfigMap
==
null
||
aclAccessConfigMap
.
isEmpty
())
{
throw
new
AclException
(
String
.
format
(
"%s file not found or isEmpty"
,
fileHome
+
File
.
separator
+
fileName
));
}
List
<
Map
<
String
,
Object
>>
accounts
=
(
List
<
Map
<
String
,
Object
>>)
aclAccessConfigMap
.
get
(
AclConstants
.
CONFIG_ACCOUNTS
);
List
<
Map
<
String
,
Object
>>
accounts
=
(
List
<
Map
<
String
,
Object
>>)
aclAccessConfigMap
.
get
(
AclConstants
.
CONFIG_ACCOUNTS
);
Map
<
String
,
Object
>
updateAccountMap
=
null
;
Map
<
String
,
Object
>
updateAccountMap
=
null
;
if
(
accounts
!=
null
)
{
if
(
accounts
!=
null
)
{
...
@@ -164,13 +166,14 @@ public class PlainPermissionManager {
...
@@ -164,13 +166,14 @@ public class PlainPermissionManager {
return
false
;
return
false
;
}
}
private
Map
<
String
,
Object
>
createAclAccessConfigMap
(
Map
<
String
,
Object
>
existedAccountMap
,
PlainAccessConfig
plainAccessConfig
)
{
private
Map
<
String
,
Object
>
createAclAccessConfigMap
(
Map
<
String
,
Object
>
existedAccoutMap
,
PlainAccessConfig
plainAccessConfig
)
{
Map
<
String
,
Object
>
newAccountsMap
=
null
;
Map
<
String
,
Object
>
newAccountsMap
=
null
;
if
(
existedAccou
n
tMap
==
null
)
{
if
(
existedAccoutMap
==
null
)
{
newAccountsMap
=
new
LinkedHashMap
<
String
,
Object
>();
newAccountsMap
=
new
LinkedHashMap
<
String
,
Object
>();
}
else
{
}
else
{
newAccountsMap
=
existedAccou
n
tMap
;
newAccountsMap
=
existedAccoutMap
;
}
}
if
(
StringUtils
.
isEmpty
(
plainAccessConfig
.
getAccessKey
())
||
if
(
StringUtils
.
isEmpty
(
plainAccessConfig
.
getAccessKey
())
||
...
@@ -219,7 +222,9 @@ public class PlainPermissionManager {
...
@@ -219,7 +222,9 @@ public class PlainPermissionManager {
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
.
class
);
Map
.
class
);
if
(
aclAccessConfigMap
==
null
||
aclAccessConfigMap
.
isEmpty
())
{
throw
new
AclException
(
String
.
format
(
"%s file not found or isEmpty"
,
fileHome
+
File
.
separator
+
fileName
));
}
List
<
Map
<
String
,
Object
>>
accounts
=
(
List
<
Map
<
String
,
Object
>>)
aclAccessConfigMap
.
get
(
"accounts"
);
List
<
Map
<
String
,
Object
>>
accounts
=
(
List
<
Map
<
String
,
Object
>>)
aclAccessConfigMap
.
get
(
"accounts"
);
if
(
accounts
!=
null
)
{
if
(
accounts
!=
null
)
{
Iterator
<
Map
<
String
,
Object
>>
itemIterator
=
accounts
.
iterator
();
Iterator
<
Map
<
String
,
Object
>>
itemIterator
=
accounts
.
iterator
();
...
@@ -251,7 +256,9 @@ public class PlainPermissionManager {
...
@@ -251,7 +256,9 @@ public class PlainPermissionManager {
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
<
String
,
Object
>
aclAccessConfigMap
=
AclUtils
.
getYamlDataObject
(
fileHome
+
File
.
separator
+
fileName
,
Map
.
class
);
Map
.
class
);
if
(
aclAccessConfigMap
==
null
||
aclAccessConfigMap
.
isEmpty
())
{
throw
new
AclException
(
String
.
format
(
"%s file not found or isEmpty"
,
fileHome
+
File
.
separator
+
fileName
));
}
List
<
String
>
globalWhiteRemoteAddrList
=
(
List
<
String
>)
aclAccessConfigMap
.
get
(
AclConstants
.
CONFIG_GLOBAL_WHITE_ADDRS
);
List
<
String
>
globalWhiteRemoteAddrList
=
(
List
<
String
>)
aclAccessConfigMap
.
get
(
AclConstants
.
CONFIG_GLOBAL_WHITE_ADDRS
);
if
(
globalWhiteRemoteAddrList
!=
null
)
{
if
(
globalWhiteRemoteAddrList
!=
null
)
{
...
@@ -259,7 +266,7 @@ public class PlainPermissionManager {
...
@@ -259,7 +266,7 @@ public class PlainPermissionManager {
globalWhiteRemoteAddrList
.
addAll
(
globalWhiteAddrsList
);
globalWhiteRemoteAddrList
.
addAll
(
globalWhiteAddrsList
);
// Update globalWhiteRemoteAddr element in memeory map firstly
// Update globalWhiteRemoteAddr element in memeory map firstly
aclAccessConfigMap
.
put
(
AclConstants
.
CONFIG_GLOBAL_WHITE_ADDRS
,
globalWhiteRemoteAddrList
);
aclAccessConfigMap
.
put
(
AclConstants
.
CONFIG_GLOBAL_WHITE_ADDRS
,
globalWhiteRemoteAddrList
);
if
(
AclUtils
.
writeDataObject
(
fileHome
+
File
.
separator
+
fileName
,
updateAclConfigFileVersion
(
aclAccessConfigMap
)))
{
if
(
AclUtils
.
writeDataObject
(
fileHome
+
File
.
separator
+
fileName
,
updateAclConfigFileVersion
(
aclAccessConfigMap
)))
{
return
true
;
return
true
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录