You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/12/20 06:55:05 UTC
[iotdb] branch rel/0.13 updated: revoke the audit log permission of the client (#8465)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 880d004f42 revoke the audit log permission of the client (#8465)
880d004f42 is described below
commit 880d004f423f486b9d850387243047655531b125
Author: Zhijia Cao <ca...@126.com>
AuthorDate: Tue Dec 20 14:55:00 2022 +0800
revoke the audit log permission of the client (#8465)
---
.../main/java/org/apache/iotdb/jdbc/Config.java | 4 -
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 2 -
.../apache/iotdb/jdbc/IoTDBConnectionParams.java | 10 --
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 3 -
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 10 --
.../control/clientsession/IClientSession.java | 2 +-
.../main/java/org/apache/iotdb/session/Config.java | 2 -
.../java/org/apache/iotdb/session/Session.java | 87 +----------------
.../apache/iotdb/session/SessionConnection.java | 2 -
.../org/apache/iotdb/session/pool/SessionPool.java | 105 +--------------------
10 files changed, 4 insertions(+), 223 deletions(-)
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
index 74e6fbd52e..0fa3cfb648 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java
@@ -56,8 +56,4 @@ public class Config {
/** key of thrift max frame size */
public static final String THRIFT_FRAME_MAX_SIZE = "thrift_max_frame_size";
-
- public static final String AUTH_ENABLE_AUDIT = "enableAudit";
-
- public static final boolean DEFAULT_ENABLE_AUDIT = true;
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
index 1137926a68..e69c376abd 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -59,7 +59,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
-import static org.apache.iotdb.jdbc.Config.AUTH_ENABLE_AUDIT;
import static org.apache.iotdb.jdbc.Config.VERSION;
public class IoTDBConnection implements Connection {
@@ -467,7 +466,6 @@ public class IoTDBConnection implements Connection {
openReq.setPassword(params.getPassword());
openReq.setZoneId(getTimeZone());
openReq.putToConfiguration(VERSION, params.getVersion().toString());
- openReq.putToConfiguration(AUTH_ENABLE_AUDIT, String.valueOf(params.isEnableAudit()));
TSOpenSessionResp openResp = null;
try {
openResp = client.openSession(openReq);
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java
index cbf2811aab..0eb86fed10 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java
@@ -35,8 +35,6 @@ public class IoTDBConnectionParams {
private int thriftDefaultBufferSize = RpcUtils.THRIFT_DEFAULT_BUF_CAPACITY;
private int thriftMaxFrameSize = RpcUtils.THRIFT_FRAME_MAX_SIZE;
- private boolean enableAudit = Config.DEFAULT_ENABLE_AUDIT;
-
public IoTDBConnectionParams(String url) {
this.jdbcUriString = url;
}
@@ -112,12 +110,4 @@ public class IoTDBConnectionParams {
public void setVersion(Constant.Version version) {
this.version = version;
}
-
- public boolean isEnableAudit() {
- return enableAudit;
- }
-
- public void setEnableAudit(boolean enableAudit) {
- this.enableAudit = enableAudit;
- }
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java
index 1a76c5ada5..17c30a17a2 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java
@@ -74,9 +74,6 @@ public class Utils {
if (info.containsKey(Config.VERSION)) {
params.setVersion(Constant.Version.valueOf(info.getProperty(Config.VERSION)));
}
- if (info.containsKey(Config.AUTH_ENABLE_AUDIT)) {
- params.setEnableAudit(Boolean.parseBoolean(info.getProperty(Config.AUTH_ENABLE_AUDIT)));
- }
return params;
}
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
index 1d4a94cf6d..1ab1a95d04 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
import java.util.Properties;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -145,13 +144,4 @@ public class UtilsTest {
Utils.parseUrl("jdbc:iotdb://127.0.0.1:6667?rpc_compress=true", properties);
assertTrue(Config.rpcThriftCompressionEnable);
}
-
- @Test
- public void testParseEnableAudit() throws IoTDBURLException {
- Properties properties = new Properties();
- properties.put("enableAudit", "false");
- IoTDBConnectionParams ioTDBConnectionParams =
- Utils.parseUrl("jdbc:iotdb://127.0.0.1:6667", properties);
- assertFalse(ioTDBConnectionParams.isEnableAudit());
- }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/clientsession/IClientSession.java b/server/src/main/java/org/apache/iotdb/db/query/control/clientsession/IClientSession.java
index a2d4707682..17c4a5ec81 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/clientsession/IClientSession.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/clientsession/IClientSession.java
@@ -44,7 +44,7 @@ public abstract class IClientSession {
private long logInTime;
- private boolean enableAudit;
+ private boolean enableAudit = true;
abstract String getClientAddress();
diff --git a/session/src/main/java/org/apache/iotdb/session/Config.java b/session/src/main/java/org/apache/iotdb/session/Config.java
index 49f8147c0f..6304fb5a5a 100644
--- a/session/src/main/java/org/apache/iotdb/session/Config.java
+++ b/session/src/main/java/org/apache/iotdb/session/Config.java
@@ -46,6 +46,4 @@ public class Config {
public static final int DEFAULT_SESSION_POOL_MAX_SIZE = 5;
public static final Version DEFAULT_VERSION = Version.V_0_13;
-
- public static final boolean DEFAULT_ENABLE_AUDIT = true;
}
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java
index 13d6e4c646..f74ae07ff8 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -142,8 +142,6 @@ public class Session {
// The version number of the client which used for compatibility in the server
protected Version version;
- protected boolean enableAudit = Config.DEFAULT_ENABLE_AUDIT;
-
public Session(String host, int rpcPort) {
this(
host,
@@ -250,27 +248,6 @@ public class Session {
Config.DEFAULT_VERSION);
}
- public Session(
- String host,
- int rpcPort,
- String username,
- String password,
- boolean enableCacheLeader,
- boolean enableAudit) {
- this(
- host,
- rpcPort,
- username,
- password,
- Config.DEFAULT_FETCH_SIZE,
- null,
- Config.DEFAULT_INITIAL_BUFFER_CAPACITY,
- Config.DEFAULT_MAX_FRAME_SIZE,
- enableCacheLeader,
- enableAudit,
- Config.DEFAULT_VERSION);
- }
-
public Session(
String host,
int rpcPort,
@@ -315,30 +292,6 @@ public class Session {
this.version = version;
}
- public Session(
- String host,
- int rpcPort,
- String username,
- String password,
- int fetchSize,
- ZoneId zoneId,
- int thriftDefaultBufferSize,
- int thriftMaxFrameSize,
- boolean enableCacheLeader,
- boolean enableAudit,
- Version version) {
- this.defaultEndPoint = new EndPoint(host, rpcPort);
- this.username = username;
- this.password = password;
- this.fetchSize = fetchSize;
- this.zoneId = zoneId;
- this.thriftDefaultBufferSize = thriftDefaultBufferSize;
- this.thriftMaxFrameSize = thriftMaxFrameSize;
- this.enableCacheLeader = enableCacheLeader;
- this.enableAudit = enableAudit;
- this.version = version;
- }
-
public Session(List<String> nodeUrls, String username, String password) {
this(
nodeUrls,
@@ -393,30 +346,6 @@ public class Session {
int thriftMaxFrameSize,
boolean enableCacheLeader,
Version version) {
- this(
- nodeUrls,
- username,
- password,
- fetchSize,
- zoneId,
- thriftDefaultBufferSize,
- thriftMaxFrameSize,
- enableCacheLeader,
- version,
- true);
- }
-
- public Session(
- List<String> nodeUrls,
- String username,
- String password,
- int fetchSize,
- ZoneId zoneId,
- int thriftDefaultBufferSize,
- int thriftMaxFrameSize,
- boolean enableCacheLeader,
- Version version,
- boolean enableAudit) {
this.nodeUrls = nodeUrls;
this.username = username;
this.password = password;
@@ -426,7 +355,6 @@ public class Session {
this.thriftMaxFrameSize = thriftMaxFrameSize;
this.enableCacheLeader = enableCacheLeader;
this.version = version;
- this.enableAudit = enableAudit;
}
public void setFetchSize(int fetchSize) {
@@ -445,10 +373,6 @@ public class Session {
this.version = version;
}
- public void setEnableAudit(boolean enableAudit) {
- this.enableAudit = enableAudit;
- }
-
public synchronized void open() throws IoTDBConnectionException {
open(false, Config.DEFAULT_CONNECTION_TIMEOUT_MS);
}
@@ -3205,8 +3129,6 @@ public class Session {
private List<String> nodeUrls = null;
- private boolean enableAudit = true;
-
public Builder host(String host) {
this.host = host;
return this;
@@ -3262,11 +3184,6 @@ public class Session {
return this;
}
- public Builder enableAudit(boolean enableAudit) {
- this.enableAudit = enableAudit;
- return this;
- }
-
public Session build() {
if (nodeUrls != null
&& (!Config.DEFAULT_HOST.equals(host) || rpcPort != Config.DEFAULT_PORT)) {
@@ -3285,8 +3202,7 @@ public class Session {
thriftDefaultBufferSize,
thriftMaxFrameSize,
enableCacheLeader,
- version,
- enableAudit);
+ version);
newSession.setEnableQueryRedirection(true);
return newSession;
}
@@ -3301,7 +3217,6 @@ public class Session {
thriftDefaultBufferSize,
thriftMaxFrameSize,
enableCacheLeader,
- enableAudit,
version);
}
}
diff --git a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 99fc006223..5d8c6f7ebf 100644
--- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -93,7 +93,6 @@ public class SessionConnection {
private List<EndPoint> endPointList = new ArrayList<>();
private boolean enableRedirect = false;
public static final String VERSION = "version";
- public static final String AUTH_ENABLE_AUDIT = "enableAudit";
// TestOnly
public SessionConnection() {}
@@ -143,7 +142,6 @@ public class SessionConnection {
openReq.setPassword(session.password);
openReq.setZoneId(zoneId.toString());
openReq.putToConfiguration(VERSION, session.version.toString());
- openReq.putToConfiguration(AUTH_ENABLE_AUDIT, String.valueOf(session.enableAudit));
try {
TSOpenSessionResp openResp = client.openSession(openReq);
diff --git a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
index 57522d79f5..711f7f66df 100644
--- a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
+++ b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
@@ -100,8 +100,6 @@ public class SessionPool {
// Redirect-able SessionPool
private final List<String> nodeUrls;
- private final boolean enableAudit;
-
public SessionPool(String host, int port, String user, String password, int maxSize) {
this(
host,
@@ -147,23 +145,6 @@ public class SessionPool {
Config.DEFAULT_CONNECTION_TIMEOUT_MS);
}
- public SessionPool(
- String host, int port, String user, String password, boolean enableAudit, int maxSize) {
- this(
- host,
- port,
- user,
- password,
- maxSize,
- Config.DEFAULT_FETCH_SIZE,
- 60_000,
- false,
- null,
- Config.DEFAULT_CACHE_LEADER_MODE,
- Config.DEFAULT_CONNECTION_TIMEOUT_MS,
- enableAudit);
- }
-
public SessionPool(
List<String> nodeUrls, String user, String password, int maxSize, boolean enableCompression) {
this(
@@ -179,22 +160,6 @@ public class SessionPool {
Config.DEFAULT_CONNECTION_TIMEOUT_MS);
}
- public SessionPool(
- List<String> nodeUrls, String user, String password, boolean enableAudit, int maxSize) {
- this(
- nodeUrls,
- user,
- password,
- maxSize,
- Config.DEFAULT_FETCH_SIZE,
- 60_000,
- false,
- null,
- Config.DEFAULT_CACHE_LEADER_MODE,
- Config.DEFAULT_CONNECTION_TIMEOUT_MS,
- enableAudit);
- }
-
public SessionPool(
String host,
int port,
@@ -281,35 +246,6 @@ public class SessionPool {
ZoneId zoneId,
boolean enableCacheLeader,
int connectionTimeoutInMs) {
- this(
- host,
- port,
- user,
- password,
- maxSize,
- fetchSize,
- waitToGetSessionTimeoutInMs,
- enableCompression,
- zoneId,
- enableCacheLeader,
- connectionTimeoutInMs,
- true);
- }
-
- @SuppressWarnings("squid:S107")
- public SessionPool(
- String host,
- int port,
- String user,
- String password,
- int maxSize,
- int fetchSize,
- long waitToGetSessionTimeoutInMs,
- boolean enableCompression,
- ZoneId zoneId,
- boolean enableCacheLeader,
- int connectionTimeoutInMs,
- boolean enableAudit) {
this.maxSize = maxSize;
this.host = host;
this.port = port;
@@ -322,7 +258,6 @@ public class SessionPool {
this.zoneId = zoneId;
this.enableCacheLeader = enableCacheLeader;
this.connectionTimeoutInMs = connectionTimeoutInMs;
- this.enableAudit = enableAudit;
}
public SessionPool(
@@ -336,32 +271,6 @@ public class SessionPool {
ZoneId zoneId,
boolean enableCacheLeader,
int connectionTimeoutInMs) {
- this(
- nodeUrls,
- user,
- password,
- maxSize,
- fetchSize,
- waitToGetSessionTimeoutInMs,
- enableCompression,
- zoneId,
- enableCacheLeader,
- connectionTimeoutInMs,
- true);
- }
-
- public SessionPool(
- List<String> nodeUrls,
- String user,
- String password,
- int maxSize,
- int fetchSize,
- long waitToGetSessionTimeoutInMs,
- boolean enableCompression,
- ZoneId zoneId,
- boolean enableCacheLeader,
- int connectionTimeoutInMs,
- boolean enableAudit) {
this.maxSize = maxSize;
this.host = null;
this.port = -1;
@@ -374,7 +283,6 @@ public class SessionPool {
this.zoneId = zoneId;
this.enableCacheLeader = enableCacheLeader;
this.connectionTimeoutInMs = connectionTimeoutInMs;
- this.enableAudit = enableAudit;
}
private Session constructNewSession() {
@@ -482,7 +390,6 @@ public class SessionPool {
session = constructNewSession();
try {
- session.setEnableAudit(enableAudit);
session.open(enableCompression, connectionTimeoutInMs);
// avoid someone has called close() the session pool
synchronized (this) {
@@ -2533,7 +2440,6 @@ public class SessionPool {
private ZoneId zoneId = null;
private boolean enableCacheLeader = Config.DEFAULT_CACHE_LEADER_MODE;
private int connectionTimeoutInMs = Config.DEFAULT_CONNECTION_TIMEOUT_MS;
- private boolean enableAudit = true;
public Builder host(String host) {
this.host = host;
@@ -2595,11 +2501,6 @@ public class SessionPool {
return this;
}
- public Builder enableAudit(boolean enableAudit) {
- this.enableAudit = enableAudit;
- return this;
- }
-
public SessionPool build() {
if (nodeUrls == null) {
return new SessionPool(
@@ -2613,8 +2514,7 @@ public class SessionPool {
enableCompression,
zoneId,
enableCacheLeader,
- connectionTimeoutInMs,
- enableAudit);
+ connectionTimeoutInMs);
} else {
return new SessionPool(
nodeUrls,
@@ -2626,8 +2526,7 @@ public class SessionPool {
enableCompression,
zoneId,
enableCacheLeader,
- connectionTimeoutInMs,
- enableAudit);
+ connectionTimeoutInMs);
}
}
}