提交 85168cd2 编写于 作者: S shendong

fix the problem of potential NPE in ACL plain

上级 be6eaf85
...@@ -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 (existedAccountMap == null) { if (existedAccoutMap == null) {
newAccountsMap = new LinkedHashMap<String, Object>(); newAccountsMap = new LinkedHashMap<String, Object>();
} else { } else {
newAccountsMap = existedAccountMap; 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.
先完成此消息的编辑!
想要评论请 注册