You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/08/24 08:42:06 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-2769] Fix auth mapping of GRANT_ROLE_PRIVILEGE and GRANT_USER_ROLE (#7099)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new c7409727c7 [To rel/0.13][IOTDB-2769] Fix auth mapping of GRANT_ROLE_PRIVILEGE and GRANT_USER_ROLE (#7099)
c7409727c7 is described below
commit c7409727c7a2e23ccad5e919e362a51f2ced1b2d
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Wed Aug 24 16:42:01 2022 +0800
[To rel/0.13][IOTDB-2769] Fix auth mapping of GRANT_ROLE_PRIVILEGE and GRANT_USER_ROLE (#7099)
---
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 4 ++--
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 ++--
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 ++--
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 12 ++++++------
.../apache/iotdb/db/qp/physical/sys/AuthorPlan.java | 20 ++++++++++----------
.../apache/iotdb/db/auth/AuthorityCheckerTest.java | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 154e523d9b..4fcfae23cd 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -109,13 +109,13 @@ public class AuthorityChecker {
return PrivilegeType.REVOKE_ROLE_PRIVILEGE.ordinal();
case REVOKE_USER_PRIVILEGE:
return PrivilegeType.REVOKE_USER_PRIVILEGE.ordinal();
- case GRANT_USER_ROLE:
+ case GRANT_ROLE_TO_USER:
return PrivilegeType.GRANT_USER_ROLE.ordinal();
case DELETE_USER:
return PrivilegeType.DELETE_USER.ordinal();
case DELETE_ROLE:
return PrivilegeType.DELETE_ROLE.ordinal();
- case REVOKE_USER_ROLE:
+ case REVOKE_ROLE_TO_USER:
return PrivilegeType.REVOKE_USER_ROLE.ordinal();
case SET_STORAGE_GROUP:
return PrivilegeType.SET_STORAGE_GROUP.ordinal();
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index ab2a539aed..cf3f282065 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -295,12 +295,12 @@ public class PlanExecutor implements IPlanExecutor {
case CREATE_ROLE:
case DELETE_ROLE:
case CREATE_USER:
- case REVOKE_USER_ROLE:
+ case REVOKE_ROLE_TO_USER:
case REVOKE_ROLE_PRIVILEGE:
case REVOKE_USER_PRIVILEGE:
case GRANT_ROLE_PRIVILEGE:
case GRANT_USER_PRIVILEGE:
- case GRANT_USER_ROLE:
+ case GRANT_ROLE_TO_USER:
case MODIFY_PASSWORD:
case DELETE_USER:
AuthorPlan author = (AuthorPlan) plan;
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
index 677eadcb51..26c811d3a7 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
@@ -98,8 +98,8 @@ public abstract class Operator {
MODIFY_PASSWORD,
GRANT_USER_PRIVILEGE,
REVOKE_USER_PRIVILEGE,
- GRANT_USER_ROLE,
- REVOKE_USER_ROLE,
+ GRANT_ROLE_TO_USER,
+ REVOKE_ROLE_TO_USER,
CREATE_ROLE,
DELETE_ROLE,
GRANT_ROLE_PRIVILEGE,
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
index 2857c45752..681c48f750 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
@@ -356,8 +356,8 @@ public abstract class PhysicalPlan {
case CREATE_USER:
plan = new AuthorPlan(OperatorType.CREATE_USER);
break;
- case REVOKE_USER_ROLE:
- plan = new AuthorPlan(OperatorType.REVOKE_USER_ROLE);
+ case REVOKE_ROLE_TO_USER:
+ plan = new AuthorPlan(OperatorType.REVOKE_ROLE_TO_USER);
break;
case REVOKE_ROLE_PRIVILEGE:
plan = new AuthorPlan(OperatorType.REVOKE_ROLE_PRIVILEGE);
@@ -371,8 +371,8 @@ public abstract class PhysicalPlan {
case GRANT_USER_PRIVILEGE:
plan = new AuthorPlan(OperatorType.GRANT_USER_PRIVILEGE);
break;
- case GRANT_USER_ROLE:
- plan = new AuthorPlan(OperatorType.GRANT_USER_ROLE);
+ case GRANT_ROLE_TO_USER:
+ plan = new AuthorPlan(OperatorType.GRANT_ROLE_TO_USER);
break;
case MODIFY_PASSWORD:
plan = new AuthorPlan(OperatorType.MODIFY_PASSWORD);
@@ -512,12 +512,12 @@ public abstract class PhysicalPlan {
CREATE_ROLE,
DELETE_ROLE,
CREATE_USER,
- REVOKE_USER_ROLE,
+ REVOKE_ROLE_TO_USER,
REVOKE_ROLE_PRIVILEGE,
REVOKE_USER_PRIVILEGE,
GRANT_ROLE_PRIVILEGE,
GRANT_USER_PRIVILEGE,
- GRANT_USER_ROLE,
+ GRANT_ROLE_TO_USER,
MODIFY_PASSWORD,
DELETE_USER,
DELETE_STORAGE_GROUP,
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
index 4d22d4e8cf..9ffc864d9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
@@ -105,10 +105,10 @@ public class AuthorPlan extends PhysicalPlan {
this.setOperatorType(Operator.OperatorType.MODIFY_PASSWORD);
break;
case GRANT_ROLE_TO_USER:
- this.setOperatorType(Operator.OperatorType.GRANT_ROLE_PRIVILEGE);
+ this.setOperatorType(Operator.OperatorType.GRANT_ROLE_TO_USER);
break;
case REVOKE_ROLE_FROM_USER:
- this.setOperatorType(Operator.OperatorType.REVOKE_USER_ROLE);
+ this.setOperatorType(Operator.OperatorType.REVOKE_ROLE_TO_USER);
break;
case LIST_USER_PRIVILEGE:
this.setQuery(true);
@@ -156,7 +156,7 @@ public class AuthorPlan extends PhysicalPlan {
case CREATE_USER:
type = AuthorType.CREATE_USER;
break;
- case REVOKE_USER_ROLE:
+ case REVOKE_ROLE_TO_USER:
type = AuthorType.REVOKE_ROLE_FROM_USER;
break;
case REVOKE_ROLE_PRIVILEGE:
@@ -166,13 +166,13 @@ public class AuthorPlan extends PhysicalPlan {
type = AuthorType.REVOKE_USER;
break;
case GRANT_ROLE_PRIVILEGE:
- type = AuthorType.GRANT_ROLE_TO_USER;
+ type = AuthorType.GRANT_ROLE;
break;
case GRANT_USER_PRIVILEGE:
type = AuthorType.GRANT_USER;
break;
- case GRANT_USER_ROLE:
- type = AuthorType.GRANT_ROLE;
+ case GRANT_ROLE_TO_USER:
+ type = AuthorType.GRANT_ROLE_TO_USER;
break;
case MODIFY_PASSWORD:
type = AuthorType.UPDATE_USER;
@@ -390,8 +390,8 @@ public class AuthorPlan extends PhysicalPlan {
case CREATE_USER:
type = PhysicalPlanType.CREATE_USER.ordinal();
break;
- case REVOKE_USER_ROLE:
- type = PhysicalPlanType.REVOKE_USER_ROLE.ordinal();
+ case REVOKE_ROLE_TO_USER:
+ type = PhysicalPlanType.REVOKE_ROLE_TO_USER.ordinal();
break;
case REVOKE_ROLE_PRIVILEGE:
type = PhysicalPlanType.REVOKE_ROLE_PRIVILEGE.ordinal();
@@ -405,8 +405,8 @@ public class AuthorPlan extends PhysicalPlan {
case GRANT_USER_PRIVILEGE:
type = PhysicalPlanType.GRANT_USER_PRIVILEGE.ordinal();
break;
- case GRANT_USER_ROLE:
- type = PhysicalPlanType.GRANT_USER_ROLE.ordinal();
+ case GRANT_ROLE_TO_USER:
+ type = PhysicalPlanType.GRANT_ROLE_TO_USER.ordinal();
break;
case MODIFY_PASSWORD:
type = PhysicalPlanType.MODIFY_PASSWORD.ordinal();
diff --git a/server/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java b/server/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
index b9580a4951..5cb375b14d 100644
--- a/server/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
@@ -172,7 +172,7 @@ public class AuthorityCheckerTest {
AuthorityChecker.check(
user.getName(),
Collections.singletonList(new PartialPath(nodeName)),
- OperatorType.GRANT_USER_ROLE,
+ OperatorType.GRANT_ROLE_TO_USER,
user.getName()));
Assert.assertTrue(