This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 2200e6fd3c6 [To rel/1.2] Fix admin and audit log management on view
(#10120)
2200e6fd3c6 is described below
commit 2200e6fd3c6597da49260422ab0b5a3c83150880
Author: Marcos_Zyk <[email protected]>
AuthorDate: Mon Jun 12 08:46:34 2023 +0800
[To rel/1.2] Fix admin and audit log management on view (#10120)
---
.../java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java | 4 ++++
server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java | 4 ++++
.../src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java | 8 ++++++++
3 files changed, 16 insertions(+)
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
index 48bf384cf80..41b7252f510 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
@@ -65,6 +65,10 @@ public enum PrivilegeType {
STOP_PIPE,
DROP_PIPE,
SHOW_PIPES,
+ CREATE_VIEW(true),
+ ALTER_VIEW(true),
+ RENAME_VIEW(true),
+ DELETE_VIEW(true),
;
private static final int PRIVILEGE_COUNT = values().length;
diff --git a/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
b/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
index 14acd8c59b6..33a2095cddf 100644
--- a/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
+++ b/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
@@ -192,6 +192,10 @@ public class AuditLogger {
case DEACTIVATE_TEMPLATE:
case CREATE_PIPEPLUGIN:
case DROP_PIPEPLUGIN:
+ case CREATE_LOGICAL_VIEW:
+ case ALTER_LOGICAL_VIEW:
+ case DELETE_LOGICAL_VIEW:
+ case RENAME_LOGICAL_VIEW:
return AuditLogOperation.DDL;
case LOAD_DATA:
case INSERT:
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 12f78d568c1..c4d42580a19 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
@@ -256,6 +256,14 @@ public class AuthorityChecker {
return PrivilegeType.DROP_PIPE.ordinal();
case SHOW_PIPES:
return PrivilegeType.SHOW_PIPES.ordinal();
+ case CREATE_LOGICAL_VIEW:
+ return PrivilegeType.CREATE_VIEW.ordinal();
+ case ALTER_LOGICAL_VIEW:
+ return PrivilegeType.ALTER_VIEW.ordinal();
+ case RENAME_LOGICAL_VIEW:
+ return PrivilegeType.RENAME_VIEW.ordinal();
+ case DELETE_LOGICAL_VIEW:
+ return PrivilegeType.DELETE_VIEW.ordinal();
default:
logger.error("Unrecognizable operator type ({}) for
AuthorityChecker.", type);
return -1;