Skip to content

branch-4.0: [fix](cloud) Fix domain user set default cluster report err #56032 #56644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Sep 30, 2025
Merged

branch-4.0: [fix](cloud) Fix domain user set default cluster report err #56032 #56644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -386,12 +385,23 @@ private String checkCloudDefaultCluster(String[] keyArr, String value, String de
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) {
Expand Down
15 changes: 15 additions & 0 deletions regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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, "")
}
}
}