sunxi92 commented on a change in pull request #3761:
URL: https://github.com/apache/rocketmq/pull/3761#discussion_r790222784
##########
File path:
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
##########
@@ -30,51 +41,74 @@
import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.logging.InternalLogger;
import org.apache.rocketmq.logging.InternalLoggerFactory;
-import org.apache.rocketmq.srvutil.FileWatchService;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.rocketmq.srvutil.AclFileWatchService;
public class PlainPermissionManager {
private static final InternalLogger log =
InternalLoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
- private static final String DEFAULT_PLAIN_ACL_FILE = "/conf/plain_acl.yml";
-
private String fileHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
- private String fileName = System.getProperty("rocketmq.acl.plain.file",
DEFAULT_PLAIN_ACL_FILE);
+ private String defaultAclDir = fileHome + File.separator
+ + System.getProperty("rocketmq.acl.dir", "/conf/acl");
+
+ private String defaultAclFile = fileHome + File.separator
+ + System.getProperty("rocketmq.acl.dir", "/conf/acl") + File.separator
+ "plain_acl.yml";
- private Map<String/** AccessKey **/, PlainAccessResource>
plainAccessResourceMap = new HashMap<>();
+ private Map<String/** aclFileName **/, Map<String/** AccessKey **/,
PlainAccessResource>> aclPlainAccessResourceMap = new HashMap<>();
+
+ private Map<String/** AccessKey **/, String/** aclFileName **/>
accessKeyTable = new HashMap<>();
private List<RemoteAddressStrategy> globalWhiteRemoteAddressStrategy = new
ArrayList<>();
private RemoteAddressStrategyFactory remoteAddressStrategyFactory = new
RemoteAddressStrategyFactory();
private boolean isWatchStart;
- private final DataVersion dataVersion = new DataVersion();
+ private Map<String/** aclFileName **/, DataVersion> dataVersionMap = new
HashMap<>();
public PlainPermissionManager() {
load();
watch();
}
public void load() {
+ if (fileHome == null || fileHome.isEmpty()) {
+ throw new AclException(String.format("%s file is empty",
fileHome));
+ }
+ File aclDir = new File(defaultAclDir);
+ File[] aclFiles = aclDir.listFiles();
+ if (aclFiles == null || aclFiles.length == 0)
+ return;
+ if (aclPlainAccessResourceMap.size() != 0 && accessKeyTable.size() !=
0) {
+ aclPlainAccessResourceMap.clear();
+ accessKeyTable.clear();
+ }
+ List<String> fileList = new ArrayList<>();
Review comment:
done
##########
File path:
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
##########
@@ -91,37 +125,51 @@ public void load() {
for (PlainAccessConfig plainAccessConfig : plainAccessConfigList) {
PlainAccessResource plainAccessResource =
buildPlainAccessResource(plainAccessConfig);
plainAccessResourceMap.put(plainAccessResource.getAccessKey(),
plainAccessResource);
+ this.accessKeyTable.put(plainAccessResource.getAccessKey(),
aclFilePath);
}
}
// For loading dataversion part just
JSONArray tempDataVersion =
plainAclConfData.getJSONArray(AclConstants.CONFIG_DATA_VERSION);
+ DataVersion dataVersion = new DataVersion();
if (tempDataVersion != null && !tempDataVersion.isEmpty()) {
- List<DataVersion> dataVersion =
tempDataVersion.toJavaList(DataVersion.class);
- DataVersion firstElement = dataVersion.get(0);
- this.dataVersion.assignNewOne(firstElement);
+ List<DataVersion> dataVersions =
tempDataVersion.toJavaList(DataVersion.class);
+ DataVersion firstElement = dataVersions.get(0);
+ dataVersion.assignNewOne(firstElement);
}
this.globalWhiteRemoteAddressStrategy =
globalWhiteRemoteAddressStrategy;
- this.plainAccessResourceMap = plainAccessResourceMap;
+ this.aclPlainAccessResourceMap.put(aclFilePath,
plainAccessResourceMap);
+ this.dataVersionMap.put(aclFilePath, dataVersion);
}
- public String getAclConfigDataVersion() {
Review comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
