This is an automated email from the ASF dual-hosted git repository.
Caideyipi pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 91336b6f5d2 Fix encrypted source login for two-stage aggregation on
dev/1.3 (#19142)
91336b6f5d2 is described below
commit 91336b6f5d203f9c6628cd9bd55fb491e4573b29
Author: Caideyipi <[email protected]>
AuthorDate: Thu Nov 5 18:01:17 2026 +0800
Fix encrypted source login for two-stage aggregation on dev/1.3 (#19142)
---
.../autocreate/IoTDBPipeTwoStageAggregateIT.java | 11 ++++----
.../iotdb/confignode/manager/ConfigManager.java | 7 ++++-
.../thrift/ConfigNodeRPCServiceProcessor.java | 2 +-
.../confignode/persistence/AuthorInfoTest.java | 16 +++++++++++
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 5 ++++
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 9 +++++--
.../apache/iotdb/db/auth/IAuthorityFetcher.java | 6 ++++-
.../iotdb/db/protocol/session/SessionManager.java | 13 ++++++++-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 9 ++++++-
.../apache/iotdb/db/auth/AuthorityCheckerTest.java | 31 ++++++++++++++++++++++
.../src/main/thrift/confignode.thrift | 1 +
11 files changed, 97 insertions(+), 13 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeTwoStageAggregateIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeTwoStageAggregateIT.java
index 7fe387a1e77..aa1d669d956 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeTwoStageAggregateIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeTwoStageAggregateIT.java
@@ -40,6 +40,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_WATERMARK_INTERVAL_KEY;
+
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2AutoCreateSchema.class})
public class IoTDBPipeTwoStageAggregateIT extends AbstractPipeDualAutoIT {
@@ -76,10 +78,7 @@ public class IoTDBPipeTwoStageAggregateIT extends
AbstractPipeDualAutoIT {
final String sourceUser = "countPointUser";
final String sourcePassword = "StrngPsWd@623454";
final String sourceDevice = "root.twostage_source.d1";
- final String processorOutputSeries =
"root.twostage_source.result.point_count";
- // The processor uses the configured output series as the tablet device
and its measurement
- // node as the tablet measurement.
- final String outputDevice = processorOutputSeries;
+ final String outputDevice = "root.twostage_source.result";
final String outputSeries = outputDevice + ".point_count";
TestUtils.executeNonQueries(
@@ -100,13 +99,13 @@ public class IoTDBPipeTwoStageAggregateIT extends
AbstractPipeDualAutoIT {
final Map<String, String> sourceAttributes = new HashMap<>();
sourceAttributes.put("source.path", sourceDevice + ".s1");
- sourceAttributes.put("source.watermark.interval-ms", "500");
+ sourceAttributes.put(SOURCE_WATERMARK_INTERVAL_KEY, "500");
sourceAttributes.put("user", sourceUser);
sourceAttributes.put("password", sourcePassword);
final Map<String, String> processorAttributes = new HashMap<>();
processorAttributes.put("processor", "count-point-processor");
- processorAttributes.put("processor.output.series", processorOutputSeries);
+ processorAttributes.put("processor.output.series", outputSeries);
final DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0);
final Map<String, String> sinkAttributes = new HashMap<>();
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 53900bdc732..23df702ca40 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -1232,9 +1232,14 @@ public class ConfigManager implements IManager {
@Override
public TPermissionInfoResp login(String username, String password) {
+ return login(username, password, false);
+ }
+
+ public TPermissionInfoResp login(
+ final String username, final String password, final boolean
useEncryptedPassword) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- return permissionManager.login(username, password);
+ return permissionManager.login(username, password, useEncryptedPassword);
} else {
TPermissionInfoResp resp = AuthUtils.generateEmptyPermissionInfoResp();
resp.setStatus(status);
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index dbce42c04ba..20dee95899d 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -730,7 +730,7 @@ public class ConfigNodeRPCServiceProcessor implements
IConfigNodeRPCService.Ifac
@Override
public TPermissionInfoResp login(TLoginReq req) {
- return configManager.login(req.getUserrname(), req.getPassword());
+ return configManager.login(req.getUserrname(), req.getPassword(),
req.isUseEncryptedPassword());
}
@Override
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
index 963808bf7cc..16b061a2ec9 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
@@ -1046,5 +1046,21 @@ public class AuthorInfoTest {
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(),
status.getCode());
TPermissionInfoResp result = authorInfo.login("testuser", "password");
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(),
result.getStatus().getCode());
+ final String encryptedPassword = AuthUtils.encryptPassword("password");
+ Assert.assertEquals(
+ TSStatusCode.SUCCESS_STATUS.getStatusCode(),
+ authorInfo.login("testuser", encryptedPassword,
true).getStatus().getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ authorInfo.login("testuser", encryptedPassword).getStatus().getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ authorInfo.login("testuser", "password", true).getStatus().getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ authorInfo
+ .login("testuser", AuthUtils.encryptPassword("wrongPassword"),
true)
+ .getStatus()
+ .getCode());
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 61b3931ba75..198529ac72b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -89,6 +89,11 @@ public class AuthorityChecker {
return authorityFetcher.get().checkUser(userName, password);
}
+ public static TSStatus checkUser(
+ final String userName, final String password, final boolean
useEncryptedPassword) {
+ return authorityFetcher.get().checkUser(userName, password,
useEncryptedPassword);
+ }
+
public static SettableFuture<ConfigTaskResult>
queryPermission(AuthorStatement authorStatement) {
return authorityFetcher.get().queryPermission(authorStatement);
}
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 5c7ca1c9603..d641d1b2baa 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
@@ -388,12 +388,16 @@ public class ClusterAuthorityFetcher implements
IAuthorityFetcher {
}
@Override
- public TSStatus checkUser(String username, String password) {
+ public TSStatus checkUser(String username, String password, boolean
useEncryptedPassword) {
checkCacheAvailable();
User user = iAuthorCache.getUserCache(username);
if (user != null) {
if (user.isOpenIdUser()) {
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
+ } else if (useEncryptedPassword) {
+ return password != null && password.equals(user.getPassword())
+ ? RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS)
+ : RpcUtils.getStatus(TSStatusCode.WRONG_LOGIN_PASSWORD,
"Authentication failed.");
} else if (password != null && AuthUtils.validatePassword(password,
user.getPassword())) {
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} else if (password != null
@@ -404,7 +408,8 @@ public class ClusterAuthorityFetcher implements
IAuthorityFetcher {
return RpcUtils.getStatus(TSStatusCode.WRONG_LOGIN_PASSWORD,
"Authentication failed.");
}
} else {
- TLoginReq req = new TLoginReq(username, password);
+ TLoginReq req =
+ new TLoginReq(username,
password).setUseEncryptedPassword(useEncryptedPassword);
TPermissionInfoResp status = null;
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/IAuthorityFetcher.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/IAuthorityFetcher.java
index cead10d9dd6..e6699a12769 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/IAuthorityFetcher.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/IAuthorityFetcher.java
@@ -32,7 +32,11 @@ import java.util.List;
public interface IAuthorityFetcher {
- TSStatus checkUser(String username, String password);
+ default TSStatus checkUser(String username, String password) {
+ return checkUser(username, password, false);
+ }
+
+ TSStatus checkUser(String username, String password, boolean
useEncryptedPassword);
boolean checkRole(String username, String rolename);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
index c062726e4e4..c67fb200fc6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
@@ -104,10 +104,21 @@ public class SessionManager implements
SessionManagerMBean {
String zoneId,
TSProtocolVersion tsProtocolVersion,
IoTDBConstant.ClientVersion clientVersion) {
+ return login(session, username, password, zoneId, tsProtocolVersion,
clientVersion, false);
+ }
+
+ public BasicOpenSessionResp login(
+ IClientSession session,
+ String username,
+ String password,
+ String zoneId,
+ TSProtocolVersion tsProtocolVersion,
+ IoTDBConstant.ClientVersion clientVersion,
+ boolean useEncryptedPassword) {
TSStatus loginStatus;
BasicOpenSessionResp openSessionResp = new BasicOpenSessionResp();
- loginStatus = AuthorityChecker.checkUser(username, password);
+ loginStatus = AuthorityChecker.checkUser(username, password,
useEncryptedPassword);
if (loginStatus.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
// check the version compatibility
if (!tsProtocolVersion.equals(CURRENT_RPC_VERSION)) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index 3987adcaaaf..c0f0023edf0 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -228,6 +228,7 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
private static final SessionManager SESSION_MANAGER =
SessionManager.getInstance();
public static final String ERROR_CODE = "error code: ";
+ private static final String USE_ENCRYPTED_PASSWORD_KEY =
"use_encrypted_password";
private static final TSProtocolVersion CURRENT_RPC_VERSION =
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3;
@@ -1244,7 +1245,8 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
req.password,
req.zoneId,
req.client_protocol,
- clientVersion);
+ clientVersion,
+ parseUseEncryptedPassword(req));
TSStatus tsStatus = RpcUtils.getStatus(openSessionResp.getCode(),
openSessionResp.getMessage());
TSOpenSessionResp resp = new TSOpenSessionResp(tsStatus,
CURRENT_RPC_VERSION);
return resp.setSessionId(openSessionResp.getSessionId());
@@ -1258,6 +1260,11 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
return IoTDBConstant.ClientVersion.V_0_12;
}
+ private boolean parseUseEncryptedPassword(TSOpenSessionReq req) {
+ return req.configuration != null
+ &&
Boolean.parseBoolean(req.configuration.get(USE_ENCRYPTED_PASSWORD_KEY));
+ }
+
@Override
public TSStatus closeSession(TSCloseSessionReq req) {
return new TSStatus(
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
index 2861059808a..9540f07ab9c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.utils.AuthUtils;
import
org.apache.iotdb.db.queryengine.plan.statement.metadata.CountLevelTimeSeriesStatement;
import
org.apache.iotdb.db.queryengine.plan.statement.metadata.CountTimeSeriesStatement;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -50,6 +51,36 @@ public class AuthorityCheckerTest {
AuthorityChecker.getAuthorityFetcher().getAuthorCache().invalidAllCache();
}
+ @Test
+ public void testCachedUserWithEncryptedPassword() {
+ final String username = "encryptedLoginUser";
+ final String password = "password";
+ final String encryptedPassword = AuthUtils.encryptPassword(password);
+ AuthorityChecker.getAuthorityFetcher()
+ .getAuthorCache()
+ .putUserCache(username, new User(username, encryptedPassword));
+
+ Assert.assertEquals(
+ TSStatusCode.SUCCESS_STATUS.getStatusCode(),
+ AuthorityChecker.checkUser(username, password).getCode());
+ Assert.assertEquals(
+ TSStatusCode.SUCCESS_STATUS.getStatusCode(),
+ AuthorityChecker.checkUser(username, encryptedPassword,
true).getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ AuthorityChecker.checkUser(username, encryptedPassword).getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ AuthorityChecker.checkUser(username, password, true).getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ AuthorityChecker.checkUser(username,
AuthUtils.encryptPassword("wrongPassword"), true)
+ .getCode());
+ Assert.assertEquals(
+ TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode(),
+ AuthorityChecker.checkUser(username, null, true).getCode());
+ }
+
@Test
public void testLogReduce() throws IllegalPathException {
final CommonConfig config = CommonDescriptor.getInstance().getConfig();
diff --git a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
index 33f34e17c9e..b9d65e43c4b 100644
--- a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
@@ -391,6 +391,7 @@ struct TAuthizedPatternTreeResp {
struct TLoginReq {
1: required string userrname
2: required string password
+ 3: optional bool useEncryptedPassword
}
struct TCheckUserPrivilegesReq {