This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 4df60badee9 branch-4.0: [fix](cloud) Fix domain user set default
cluster report err #56032 (#56644)
4df60badee9 is described below
commit 4df60badee97eb7a9bc4fde31a4eb130af9b370a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Sep 30 12:11:10 2025 +0800
branch-4.0: [fix](cloud) Fix domain user set default cluster report err
#56032 (#56644)
Cherry-picked from #56032
Co-authored-by: deardeng <[email protected]>
---
.../org/apache/doris/mysql/privilege/UserProperty.java | 18 ++++++++++++++----
.../cloud_p0/auth/test_set_default_cluster.groovy | 15 +++++++++++++++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
index 6244634ecdb..62306ab5f67 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
@@ -18,7 +18,6 @@
package org.apache.doris.mysql.privilege;
import org.apache.doris.analysis.ResourceTypeEnum;
-import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Env;
import org.apache.doris.cloud.qe.ComputeGroupException;
import org.apache.doris.common.AnalysisException;
@@ -386,12 +385,23 @@ public class UserProperty {
return value;
}
// check cluster auth
- if (!Strings.isNullOrEmpty(value) &&
!Env.getCurrentEnv().getAccessManager().checkCloudPriv(
- new UserIdentity(qualifiedUser, "%"), value, PrivPredicate.USAGE,
ResourceTypeEnum.CLUSTER)) {
+ // get all users with same name but different host
+ AccessControllerManager am = Env.getCurrentEnv().getAccessManager();
+ List<User> users = am.getAuth()
+ .getUserManager().getUserByName(qualifiedUser);
+ boolean pass = false;
+ for (User user : users) {
+ if (!Strings.isNullOrEmpty(value) && am.checkCloudPriv(
+ user.getUserIdentity(), value, PrivPredicate.USAGE,
ResourceTypeEnum.CLUSTER)) {
+ pass = true;
+ }
+ }
+ if (!pass && !Strings.isNullOrEmpty(value)) {
throw new ComputeGroupException(String.format("set default compute
group failed, "
- + "user %s has no permission to use compute group '%s', please
grant use privilege first ",
+ + "user %s has no permission to use compute group '%s',
please grant use privilege first ",
qualifiedUser, value),
ComputeGroupException.FailedTypeEnum.CURRENT_USER_NO_AUTH_TO_USE_COMPUTE_GROUP);
+
}
// set property "DEFAULT_CLOUD_CLUSTER" = "cluster1"
if (keyArr.length != 1) {
diff --git
a/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
b/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
index e5bb053e683..ddcf6cd28f4 100644
--- a/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
+++ b/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
@@ -42,10 +42,14 @@ suite("test_default_cluster", "docker") {
def user1 = "default_user1"
// admin role
def user2 = "default_user2"
+ // domain user
+ def user3 = "default_user3@'175.%'"
sql """CREATE USER $user1 IDENTIFIED BY 'Cloud123456' DEFAULT ROLE
'admin'"""
sql """CREATE USER $user2 IDENTIFIED BY 'Cloud123456'"""
+ sql """CREATE USER $user3 IDENTIFIED BY 'Cloud123456'"""
sql """GRANT SELECT_PRIV on *.*.* to ${user2}"""
+ sql """GRANT SELECT_PRIV on *.*.* to ${user3}"""
def clusters = sql " SHOW CLUSTERS "
assertTrue(!clusters.isEmpty())
@@ -92,5 +96,16 @@ suite("test_default_cluster", "docker") {
def ret = getProperty("default_cloud_cluster")
assertEquals(ret.Value as String, "")
}
+
+ // user3
+ sql """GRANT USAGE_PRIV ON COMPUTE GROUP $validCluster TO $user3"""
+ // succ
+ connectInDocker('default_user3', 'Cloud123456') {
+ // user set himself
+ setAndCheckDefaultCluster validCluster
+ // sql """set property 'DEFAULT_CLOUD_CLUSTER' = '' """
+ // def ret = getProperty("default_cloud_cluster")
+ // assertEquals(ret.Value as String, "")
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
