You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by li...@apache.org on 2026/04/24 07:52:48 UTC
(doris) branch master updated: [fix](fe) Reject invalid stream load tokens on commit and rollback (#62111)
This is an automated email from the ASF dual-hosted git repository.
liaoxin01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 589a32cb064 [fix](fe) Reject invalid stream load tokens on commit and rollback (#62111)
589a32cb064 is described below
commit 589a32cb0642c0484a4bd6d73badbbfa96f3679d
Author: Xin Liao <li...@selectdb.com>
AuthorDate: Fri Apr 24 15:52:40 2026 +0800
[fix](fe) Reject invalid stream load tokens on commit and rollback (#62111)
Problem Summary: Stream load commit and rollback accepted invalid tokens
because the return value of checkToken() was ignored.
---
.../apache/doris/service/FrontendServiceImpl.java | 14 ++-
.../doris/service/FrontendServiceImplTest.java | 119 +++++++++++++++++++++
2 files changed, 129 insertions(+), 4 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index b2cf11cebd0..63303b0c469 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -1739,7 +1739,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
if (request.isSetAuthCode()) {
// TODO: deprecated, removed in 3.1, use token instead.
} else if (request.isSetToken()) {
- checkToken(request.getToken());
+ checkTokenOrThrow(request.getToken());
} else {
if (CollectionUtils.isNotEmpty(request.getTbls())) {
checkPasswordAndPrivs(request.getUser(), request.getPasswd(), request.getDb(),
@@ -1876,7 +1876,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
if (request.isSetAuthCode()) {
// TODO: deprecated, removed in 3.1, use token instead.
} else if (request.isSetToken()) {
- checkToken(request.getToken());
+ checkTokenOrThrow(request.getToken());
} else {
List<String> tables = tableList.stream().map(Table::getName).collect(Collectors.toList());
checkPasswordAndPrivs(request.getUser(), request.getPasswd(), request.getDb(), tables,
@@ -1961,7 +1961,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
if (request.isSetAuthCode()) {
// TODO: deprecated, removed in 3.1, use token instead.
} else if (request.isSetToken()) {
- checkToken(request.getToken());
+ checkTokenOrThrow(request.getToken());
} else {
// multi table load
if (CollectionUtils.isNotEmpty(request.getTbls())) {
@@ -2080,7 +2080,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
if (request.isSetAuthCode()) {
// TODO: deprecated, removed in 3.1, use token instead.
} else if (request.isSetToken()) {
- checkToken(request.getToken());
+ checkTokenOrThrow(request.getToken());
} else {
List<String> tables = tableList.stream().map(Table::getName).collect(Collectors.toList());
checkPasswordAndPrivs(request.getUser(), request.getPasswd(), request.getDb(), tables,
@@ -2093,6 +2093,12 @@ public class FrontendServiceImpl implements FrontendService.Iface {
TxnCommitAttachment.fromThrift(request.getTxnCommitAttachment()), tableList);
}
+ private void checkTokenOrThrow(String token) throws AuthenticationException {
+ if (!checkToken(token)) {
+ throw new AuthenticationException("Invalid token");
+ }
+ }
+
@Override
public TBeginRemoteTxnResult beginRemoteTxn(TBeginRemoteTxnRequest request) throws TException {
String clientAddr = getClientAddrAsString();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java b/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java
index 4df8646a899..70655ee7d57 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/service/FrontendServiceImplTest.java
@@ -22,10 +22,12 @@ import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
+import org.apache.doris.common.AuthenticationException;
import org.apache.doris.common.Config;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.util.DatasourcePrintableMap;
+import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.nereids.trees.plans.commands.Command;
import org.apache.doris.nereids.trees.plans.commands.CreateDatabaseCommand;
@@ -35,20 +37,26 @@ import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.tablefunction.BackendsTableValuedFunction;
import org.apache.doris.thrift.TBackendsMetadataParams;
+import org.apache.doris.thrift.TCommitTxnRequest;
import org.apache.doris.thrift.TCreatePartitionRequest;
import org.apache.doris.thrift.TCreatePartitionResult;
import org.apache.doris.thrift.TFetchSchemaTableDataRequest;
import org.apache.doris.thrift.TFetchSchemaTableDataResult;
import org.apache.doris.thrift.TGetDbsParams;
import org.apache.doris.thrift.TGetDbsResult;
+import org.apache.doris.thrift.TLoadTxnCommitRequest;
+import org.apache.doris.thrift.TLoadTxnRollbackRequest;
import org.apache.doris.thrift.TMetadataTableRequestParams;
import org.apache.doris.thrift.TMetadataType;
import org.apache.doris.thrift.TNullableStringLiteral;
+import org.apache.doris.thrift.TRollbackTxnRequest;
import org.apache.doris.thrift.TSchemaTableName;
import org.apache.doris.thrift.TSchemaTableRequestParams;
import org.apache.doris.thrift.TShowUserRequest;
import org.apache.doris.thrift.TShowUserResult;
import org.apache.doris.thrift.TStatusCode;
+import org.apache.doris.transaction.GlobalTransactionMgrIface;
+import org.apache.doris.transaction.TransactionState;
import org.apache.doris.utframe.UtFrameUtils;
import org.junit.AfterClass;
@@ -57,10 +65,14 @@ import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.MockedStatic;
import org.mockito.Mockito;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -426,4 +438,111 @@ public class FrontendServiceImplTest {
executeCommand("DROP ROLE IF EXISTS " + readerRole);
}
}
+
+ @Test
+ public void testLoadTxnCommitRejectsInvalidToken() {
+ FrontendServiceImpl impl = Mockito.spy(new FrontendServiceImpl(exeEnv));
+ TLoadTxnCommitRequest request = new TLoadTxnCommitRequest();
+ request.setToken("bad-token");
+ Mockito.doReturn(false).when(impl).checkToken("bad-token");
+
+ assertInvalidToken(impl, "loadTxnCommitImpl", request);
+ }
+
+ @Test
+ public void testLoadTxnRollbackRejectsInvalidToken() {
+ FrontendServiceImpl impl = Mockito.spy(new FrontendServiceImpl(exeEnv));
+ TLoadTxnRollbackRequest request = new TLoadTxnRollbackRequest();
+ request.setToken("bad-token");
+ Mockito.doReturn(false).when(impl).checkToken("bad-token");
+
+ assertInvalidToken(impl, "loadTxnRollbackImpl", request);
+ }
+
+ @Test
+ public void testCommitTxnRejectsInvalidToken() {
+ FrontendServiceImpl impl = Mockito.spy(new FrontendServiceImpl(exeEnv));
+ TCommitTxnRequest request = new TCommitTxnRequest();
+ request.setUser("root");
+ request.setPasswd("");
+ request.setDb("test");
+ request.setTxnId(100L);
+ request.setCommitInfos(Collections.emptyList());
+ request.setToken("bad-token");
+ Mockito.doReturn(false).when(impl).checkToken("bad-token");
+
+ mockTransactionForTokenValidation(100L);
+ try {
+ assertInvalidToken(impl, "commitTxnImpl", request);
+ } finally {
+ closeTransactionValidationMock();
+ }
+ }
+
+ @Test
+ public void testRollbackTxnRejectsInvalidToken() {
+ FrontendServiceImpl impl = Mockito.spy(new FrontendServiceImpl(exeEnv));
+ TRollbackTxnRequest request = new TRollbackTxnRequest();
+ request.setUser("root");
+ request.setPasswd("");
+ request.setDb("test");
+ request.setTxnId(100L);
+ request.setToken("bad-token");
+ Mockito.doReturn(false).when(impl).checkToken("bad-token");
+
+ mockTransactionForTokenValidation(100L);
+ try {
+ assertInvalidToken(impl, "rollbackTxnImpl", request);
+ } finally {
+ closeTransactionValidationMock();
+ }
+ }
+
+ private MockedStatic<Env> transactionValidationEnvMock;
+
+ private void mockTransactionForTokenValidation(long txnId) {
+ Env env = Mockito.mock(Env.class);
+ InternalCatalog catalog = Mockito.mock(InternalCatalog.class);
+ Database db = Mockito.mock(Database.class);
+ TransactionState transactionState = Mockito.mock(TransactionState.class);
+ GlobalTransactionMgrIface globalTransactionMgr = Mockito.mock(GlobalTransactionMgrIface.class);
+ List<Long> tableIds = Collections.singletonList(10L);
+
+ Mockito.when(env.getInternalCatalog()).thenReturn(catalog);
+ Mockito.when(catalog.getDbNullable("test")).thenReturn(db);
+ Mockito.when(db.getId()).thenReturn(1L);
+ Mockito.when(globalTransactionMgr.getTransactionState(1L, txnId)).thenReturn(transactionState);
+ Mockito.when(transactionState.getTableIdList()).thenReturn(tableIds);
+ try {
+ Mockito.doReturn(Collections.emptyList()).when(db).getTablesOnIdOrderOrThrowException(tableIds);
+ } catch (Exception e) {
+ throw new AssertionError(e);
+ }
+
+ transactionValidationEnvMock = Mockito.mockStatic(Env.class);
+ transactionValidationEnvMock.when(Env::getCurrentEnv).thenReturn(env);
+ transactionValidationEnvMock.when(Env::getCurrentGlobalTransactionMgr).thenReturn(globalTransactionMgr);
+ }
+
+ private void closeTransactionValidationMock() {
+ if (transactionValidationEnvMock != null) {
+ transactionValidationEnvMock.close();
+ transactionValidationEnvMock = null;
+ }
+ }
+
+ private void assertInvalidToken(FrontendServiceImpl impl, String methodName, Object request) {
+ try {
+ Method method = FrontendServiceImpl.class.getDeclaredMethod(methodName, request.getClass());
+ method.setAccessible(true);
+ method.invoke(impl, request);
+ Assert.fail("expected invalid token");
+ } catch (InvocationTargetException e) {
+ Assert.assertTrue(e.getCause() instanceof AuthenticationException);
+ Assert.assertTrue(e.getCause().getMessage().contains("Invalid token"));
+ Assert.assertFalse(e.getCause().getMessage().contains("bad-token"));
+ } catch (ReflectiveOperationException e) {
+ throw new AssertionError(e);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org