userid-v1

Author: shiwenyan

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/IEntityAccessor.java

@@ -35,6 +35,21 @@ public interface IEntityAccessor extends SnapshotProcessor {
    */
   Role loadEntity(String entityName) throws IOException;
 
+  /**
+   * Deserialize userid from lower storage.
+   *
+   * @return The max userid.
+   * @throws IOException if an exception is raised when interacting with the lower storage.
+   */
+  long loadUserId() throws IOException;
+
+  /**
+   * save maxUserId to lower storage when snapshot.
+   *
+   * @throws IOException if an exception is raised when interacting with the lower storage.
+   */
+  void saveUserId(long nextUserId) throws IOException;
+
   /**
    * Serialize the entity object to lower storage.
    *

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/User.java

@@ -34,6 +34,8 @@
 /** This class contains all information of a User. */
 public class User extends Role {
 
+  private long userId;
+
   private String password;
 
   private Set<String> roleSet;
@@ -56,6 +58,13 @@ public User(String name, String password) {
     this.roleSet = new HashSet<>();
   }
 
+  public User(String name, String password, long userId) {
+    super(name);
+    this.password = password;
+    this.userId = userId;
+    this.roleSet = new HashSet<>();
+  }
+
   /** ---------- set func ---------------* */
   public void setPassword(String password) {
     this.password = password;
@@ -73,7 +82,15 @@ public void addRole(String roleName) {
     roleSet.add(roleName);
   }
 
+  public void setUserId(long userId) {
+    this.userId = userId;
+  }
+
   /** ------------ get func ----------------* */
+  public long getUserId() {
+    return userId;
+  }
+
   public String getPassword() {
     return password;
   }

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/role/LocalFileRoleAccessor.java

@@ -223,6 +223,23 @@ public Role loadEntity(String entityName) throws IOException {
     }
   }
 
+  @Override
+  public long loadUserId() throws IOException {
+    File userIdFile = checkFileAvailable("user_id", "");
+    if (userIdFile == null) {
+      return -1;
+    }
+    FileInputStream inputStream = new FileInputStream(userIdFile);
+    try (DataInputStream dataInputStream =
+        new DataInputStream(new BufferedInputStream(inputStream))) {
+      return dataInputStream.readLong();
+    } catch (Exception e) {
+      throw new IOException(e);
+    } finally {
+      strBufferLocal.remove();
+    }
+  }
+
   @Override
   public void saveEntity(Role entity) throws IOException {
     File roleProfile =
@@ -378,4 +395,35 @@ public void cleanEntityFolder() {
       LOGGER.warn("Role folder not exists");
     }
   }
+
+  @Override
+  public void saveUserId(long nextUserId) throws IOException {
+    File userInfoProfile =
+        SystemFileFactory.INSTANCE.getFile(
+            entityDirPath
+                + File.separator
+                + "user_id"
+                + IoTDBConstant.PROFILE_SUFFIX
+                + TEMP_SUFFIX);
+    File userDir = new File(entityDirPath);
+    if (!userDir.exists() && !userDir.mkdirs()) {
+      LOGGER.error("Failed to create user dir {}", entityDirPath);
+    }
+
+    try (FileOutputStream fileOutputStream = new FileOutputStream(userInfoProfile);
+        BufferedOutputStream outputStream = new BufferedOutputStream(fileOutputStream)) {
+      IOUtils.writeLong(outputStream, nextUserId, encodingBufferLocal);
+      outputStream.flush();
+      fileOutputStream.getFD().sync();
+    } catch (Exception e) {
+      LOGGER.warn("meet error when save userId: {}", nextUserId);
+      throw new IOException(e);
+    } finally {
+      encodingBufferLocal.remove();
+    }
+    File oldFile =
+        SystemFileFactory.INSTANCE.getFile(
+            entityDirPath + File.separator + "user_id" + IoTDBConstant.PROFILE_SUFFIX);
+    IOUtils.replaceFile(userInfoProfile, oldFile);
+  }
 }

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/BasicUserManager.java

@@ -35,6 +35,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 /** This class stores information of each user. */
 public abstract class BasicUserManager extends BasicRoleManager {
 
@@ -50,6 +52,8 @@ protected String getNoSuchEntityError() {
     return "No such user %s";
   }
 
+  protected long nextUserId = 9999;
+
   /**
    * BasicUserManager Constructor.
    *
@@ -102,6 +106,20 @@ private void initAdmin() throws AuthException {
     LOGGER.info("Admin initialized");
   }
 
+  private void initUserId() {
+    try {
+      long maxUserId = this.accessor.loadUserId();
+      if (maxUserId == -1 || maxUserId < 10000) {
+        nextUserId = 10000;
+      } else {
+        nextUserId = maxUserId;
+      }
+    } catch (IOException e) {
+      LOGGER.warn("meet error in load max userId.");
+      throw new RuntimeException(e);
+    }
+  }
+
   @Override
   public User getEntity(String entityName) {
     return (User) super.getEntity(entityName);
@@ -128,7 +146,15 @@ public boolean createUser(
     }
     lock.writeLock(username);
     try {
-      user = new User(username, enableEncrypt ? AuthUtils.encryptPassword(password) : password);
+      long userid = 0;
+      if (username.equals("root")) {
+        userid = 0;
+      } else {
+        userid = ++nextUserId;
+      }
+      user =
+          new User(
+              username, enableEncrypt ? AuthUtils.encryptPassword(password) : password, userid);
       entityMap.put(username, user);
       return true;
     } finally {
@@ -197,6 +223,7 @@ private void init() throws AuthException {
   @Override
   public void reset() throws AuthException {
     super.reset();
+    initUserId();
     initAdmin();
   }
 

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserAccessor.java

@@ -89,6 +89,7 @@ protected String getEntitySnapshotFileName() {
 
   @Override
   protected void saveEntityName(BufferedOutputStream outputStream, Role role) throws IOException {
+    IOUtils.writeLong(outputStream, ((User) role).getUserId(), encodingBufferLocal);
     super.saveEntityName(outputStream, role);
     IOUtils.writeString(
         outputStream, ((User) role).getPassword(), STRING_ENCODING, encodingBufferLocal);
@@ -165,6 +166,7 @@ public User loadEntity(String entityName) throws IOException {
         user.setPrivilegeList(pathPrivilegeList);
       } else {
         assert (tag == VERSION);
+        user.setUserId(dataInputStream.readLong());
         user.setName(IOUtils.readString(dataInputStream, STRING_ENCODING, strBufferLocal));
         user.setPassword(IOUtils.readString(dataInputStream, STRING_ENCODING, strBufferLocal));
         loadPrivileges(dataInputStream, user);

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/LocalFileUserManager.java

@@ -39,6 +39,7 @@ public boolean processTakeSnapshot(File snapshotDir) throws TException, IOExcept
     for (Map.Entry<String, Role> entry : entityMap.entrySet()) {
       accessor.saveEntity(entry.getValue());
     }
+    accessor.saveUserId(nextUserId);
     return accessor.processTakeSnapshot(snapshotDir);
   }
 

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/IOUtils.java

@@ -92,6 +92,36 @@ public static void writeInt(
     outputStream.write(encodingBuffer.array(), 0, Integer.BYTES);
   }
 
+  /**
+   * Write a long (8-byte) into the given stream.
+   *
+   * @param outputStream the destination to insert.
+   * @param i the long value to be written.
+   * @param encodingBufferLocal a ThreadLocal buffer may be passed to avoid frequent memory
+   *     allocations. A null may also be passed to use a local buffer.
+   * @throws IOException when an exception raised during operating the stream.
+   */
+  public static void writeLong(
+      OutputStream outputStream, long i, ThreadLocal<ByteBuffer> encodingBufferLocal)
+      throws IOException {
+
+    ByteBuffer encodingBuffer;
+    if (encodingBufferLocal != null) {
+      encodingBuffer = encodingBufferLocal.get();
+      if (encodingBuffer == null) {
+        // 8 bytes is exactly what we need for a long
+        encodingBuffer = ByteBuffer.allocate(8);
+        encodingBufferLocal.set(encodingBuffer);
+      }
+    } else {
+      encodingBuffer = ByteBuffer.allocate(8);
+    }
+
+    encodingBuffer.clear();
+    encodingBuffer.putLong(i);
+    outputStream.write(encodingBuffer.array(), 0, Long.BYTES);
+  }
+
   /**
    * Read a string from the given stream.
    *