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 b4c2caeaf2f Manipulate series of Audit and IoTDB reporter as super user
b4c2caeaf2f is described below
commit b4c2caeaf2f71ad7cac62fcb4eaaead93c568d9d
Author: Weihao Li <[email protected]>
AuthorDate: Mon Sep 25 17:09:08 2023 +0800
Manipulate series of Audit and IoTDB reporter as super user
---
.../src/main/java/org/apache/iotdb/db/audit/AuditLogger.java | 7 ++++++-
.../iotdb/db/service/metrics/IoTDBInternalLocalReporter.java | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
index fa1fd88dbd8..7c465d34a6b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
@@ -21,12 +21,14 @@ package org.apache.iotdb.db.audit;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IllegalPathException;
+import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.protocol.session.ClientSession;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher;
import
org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
@@ -43,6 +45,7 @@ import org.slf4j.LoggerFactory;
import javax.validation.constraints.NotNull;
+import java.time.ZoneId;
import java.util.List;
import static
org.apache.iotdb.db.pipe.receiver.legacy.loader.ILoader.SCHEMA_FETCHER;
@@ -59,6 +62,8 @@ public class AuditLogger {
private static final Coordinator COORDINATOR = Coordinator.getInstance();
private static final IoTDBConfig config =
IoTDBDescriptor.getInstance().getConfig();
private static final List<AuditLogStorage> auditLogStorageList =
config.getAuditLogStorage();
+ private static final SessionInfo sessionInfo =
+ new SessionInfo(0, AuthorityChecker.SUPER_USER,
ZoneId.systemDefault().getId());
private static final List<AuditLogOperation> auditLogOperationList =
config.getAuditLogOperation();
@@ -108,7 +113,7 @@ public class AuditLogger {
COORDINATOR.execute(
generateInsertStatement(log, address, username),
SESSION_MANAGER.requestQueryId(),
- SESSION_MANAGER.getSessionInfo(SESSION_MANAGER.getCurrSession()),
+ sessionInfo,
"",
ClusterPartitionFetcher.getInstance(),
SCHEMA_FETCHER);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
index da7a72206eb..8e08e14c633 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
+import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.protocol.client.ConfigNodeClient;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
@@ -81,7 +82,7 @@ public class IoTDBInternalLocalReporter extends
IoTDBInternalReporter {
public IoTDBInternalLocalReporter() {
partitionFetcher = ClusterPartitionFetcher.getInstance();
schemaFetcher = ClusterSchemaFetcher.getInstance();
- sessionInfo = new SessionInfo(0, "root", ZoneId.systemDefault().getId());
+ sessionInfo = new SessionInfo(0, AuthorityChecker.SUPER_USER,
ZoneId.systemDefault().getId());
IClientManager<ConfigRegionId, ConfigNodeClient> configNodeClientManager =
ConfigNodeClientManager.getInstance();