[iotdb] branch master updated: [auth].fix internal error when check sysPri grant option

[jackietien]

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

jackietien 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 62a956d3ed5 [auth].fix internal error when check sysPri grant option
62a956d3ed5 is described below

commit 62a956d3ed53c74ee57ce0a2824fb39fbf548a7c
Author: Colin Li <105656576+shuol...@users.noreply.github.com>
AuthorDate: Sat Oct 7 10:32:18 2023 +0800

    [auth].fix internal error when check sysPri grant option
---
 .../iotdb/db/auth/ClusterAuthorityFetcher.java     | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
index 72c9f26f306..82a550cea0b 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
@@ -69,6 +69,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
   private boolean cacheOutDate = false;
   private long heartBeatTimeStamp = 0;
 
+  // for test only.
+  private boolean acceptCache = true;
+
   private static final IClientManager<ConfigRegionId, ConfigNodeClient> 
CONFIG_NODE_CLIENT_MANAGER =
       ConfigNodeClientManager.getInstance();
 
@@ -167,7 +170,7 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           Role role = iAuthorCache.getRoleCache(roleName);
           if (role == null) {
             return checkUserPrivilegeGrantOptFromConfigNode(
-                username, Collections.singletonList(new PartialPath()), 
permission);
+                username, Collections.emptyList(), permission);
           }
           if (role.checkSysPriGrantOpt(permission)) {
             return true;
@@ -178,7 +181,7 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
       return true;
     } else {
       return checkUserPrivilegeGrantOptFromConfigNode(
-          username, Collections.singletonList(new PartialPath()), permission);
+          username, Collections.emptyList(), permission);
     }
   }
 
@@ -200,7 +203,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, 
CONNECTERROR));
     }
     if (permissionInfoResp.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      }
       return true;
     } else {
       return false;
@@ -252,7 +257,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, 
CONNECTERROR));
     }
     if (authizedPatternTree.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      iAuthorCache.putUserCache(username, 
cacheUser(authizedPatternTree.getPermissionInfo()));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, 
cacheUser(authizedPatternTree.getPermissionInfo()));
+      }
       return 
PathPatternTree.deserialize(ByteBuffer.wrap(authizedPatternTree.getPathPatternTree()));
     } else {
       throw new AuthException(
@@ -408,7 +415,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
         }
       }
       if (status.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-        iAuthorCache.putUserCache(username, cacheUser(status));
+        if (acceptCache) {
+          iAuthorCache.putUserCache(username, cacheUser(status));
+        }
         return status.getStatus();
       } else {
         return status.getStatus();
@@ -443,7 +452,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, 
CONNECTERROR));
     }
     if (permissionInfoResp.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      }
     }
     return permissionInfoResp.getStatus();
   }
@@ -465,7 +476,9 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, 
CONNECTERROR));
     }
     if (permissionInfoResp.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      }
     }
     return permissionInfoResp.getFailPos();
   }
@@ -486,11 +499,15 @@ public class ClusterAuthorityFetcher implements 
IAuthorityFetcher {
           RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, 
CONNECTERROR));
     }
     if (permissionInfoResp.getStatus().getCode() == 
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-      iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      }
       return true;
     } else if (permissionInfoResp.getStatus().getCode()
         == TSStatusCode.USER_NOT_HAS_ROLE.getStatusCode()) {
-      iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      if (acceptCache) {
+        iAuthorCache.putUserCache(username, cacheUser(permissionInfoResp));
+      }
       return false;
     } else {
       return false;