[iotdb] branch master updated: [IOTDB-3139] fix place of auth folder. (#5855)

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new f0ec7abe96 [IOTDB-3139] fix place of auth folder. (#5855)
f0ec7abe96 is described below

commit f0ec7abe967117e160c9be368b0430d1ad6067c7
Author: ZhangHongYin <46039728+sprico...@users.noreply.github.com>
AuthorDate: Wed May 11 09:32:33 2022 +0800

    [IOTDB-3139] fix place of auth folder. (#5855)
---
 .../iotdb/confignode/conf/ConfigNodeDescriptor.java      |  1 +
 .../iotdb/commons/auth/role/LocalFileRoleAccessor.java   |  8 ++++----
 .../iotdb/commons/auth/user/LocalFileUserAccessor.java   |  6 +++---
 .../java/org/apache/iotdb/commons/conf/CommonConfig.java | 16 ++++++++++++++++
 .../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java   |  1 +
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 1824e21ad1..9065722d72 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -220,6 +220,7 @@ public class ConfigNodeDescriptor {
       LOGGER.warn("Couldn't load ConfigNode conf file, use default config", e);
     } finally {
       conf.updatePath();
+      
commonConfig.updatePath(System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME, 
null));
     }
   }
 
diff --git 
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/role/LocalFileRoleAccessor.java
 
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/role/LocalFileRoleAccessor.java
index 5f10a0a5aa..abe5cec513 100644
--- 
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/role/LocalFileRoleAccessor.java
+++ 
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/role/LocalFileRoleAccessor.java
@@ -84,9 +84,10 @@ public class LocalFileRoleAccessor implements IRoleAccessor {
         return null;
       }
     }
-    FileInputStream inputStream = new FileInputStream(roleProfile);
-    try (DataInputStream dataInputStream =
-        new DataInputStream(new BufferedInputStream(inputStream))) {
+
+    try (FileInputStream inputStream = new FileInputStream(roleProfile);
+        DataInputStream dataInputStream =
+            new DataInputStream(new BufferedInputStream(inputStream))) {
       Role role = new Role();
       role.setName(IOUtils.readString(dataInputStream, STRING_ENCODING, 
strBufferLocal));
 
@@ -97,7 +98,6 @@ public class LocalFileRoleAccessor implements IRoleAccessor {
             IOUtils.readPathPrivilege(dataInputStream, STRING_ENCODING, 
strBufferLocal));
       }
       role.setPrivilegeList(pathPrivilegeList);
-
       return role;
     } catch (Exception e) {
       throw new IOException(e);
diff --git 
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java
 
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java
index dc40e266af..696074e3d3 100644
--- 
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java
+++ 
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java
@@ -98,9 +98,9 @@ public class LocalFileUserAccessor implements IUserAccessor {
         return null;
       }
     }
-    FileInputStream inputStream = new FileInputStream(userProfile);
-    try (DataInputStream dataInputStream =
-        new DataInputStream(new BufferedInputStream(inputStream))) {
+    try (FileInputStream inputStream = new FileInputStream(userProfile);
+        DataInputStream dataInputStream =
+            new DataInputStream(new BufferedInputStream(inputStream))) {
       User user = new User();
       user.setName(IOUtils.readString(dataInputStream, STRING_ENCODING, 
strBufferLocal));
       user.setPassword(IOUtils.readString(dataInputStream, STRING_ENCODING, 
strBufferLocal));
diff --git 
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java 
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index 49b273702e..2583862f75 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -64,6 +64,22 @@ public class CommonConfig {
     private static final CommonConfig INSTANCE = new CommonConfig();
   }
 
+  public void updatePath(String homeDir) {
+    userFolder = addHomeDir(userFolder, homeDir);
+    roleFolder = addHomeDir(roleFolder, homeDir);
+  }
+
+  private String addHomeDir(String dir, String homeDir) {
+    if (!new File(dir).isAbsolute() && homeDir != null && homeDir.length() > 
0) {
+      if (!homeDir.endsWith(File.separator)) {
+        dir = homeDir + File.separatorChar + dir;
+      } else {
+        dir = homeDir + dir;
+      }
+    }
+    return dir;
+  }
+
   public String getEncryptDecryptProvider() {
     return encryptDecryptProvider;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java 
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 162fdf0af6..ca3a13b02a 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -932,6 +932,7 @@ public class IoTDBDescriptor {
     } finally {
       // update all data seriesPath
       conf.updatePath();
+      commonConfig.updatePath(System.getProperty(IoTDBConstant.IOTDB_HOME, 
null));
     }
   }