database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Pick]Fix show role stmt missing grouo info (#37920)

Browse Source 
## Proposed changes

pick #36032
This commit is contained in:
wangbo
2024-07-16 20:41:59 +08:00
committed by GitHub
parent cc85f7b94c
commit 2edb9501b5
3 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRolesStmt.java
View File

@ -41,6 +41,7 @@ public class ShowRolesStmt extends ShowStmt {
builder.addColumn(new Column("DatabasePrivs", ScalarType.createVarchar(300)));
builder.addColumn(new Column("TablePrivs", ScalarType.createVarchar(300)));
builder.addColumn(new Column("ResourcePrivs", ScalarType.createVarchar(300)));
builder.addColumn(new Column("WorkloadGroupPrivs", ScalarType.createVarchar(300)));
META_DATA = builder.build();
}

3
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java
View File

@ -174,7 +174,8 @@ public class RoleManager implements Writable, GsonPostProcessable {
}
}, (s1, s2) -> s1 + " " + s2
));
Stream.of(PrivLevel.GLOBAL, PrivLevel.CATALOG, PrivLevel.DATABASE, PrivLevel.TABLE, PrivLevel.RESOURCE)
Stream.of(PrivLevel.GLOBAL, PrivLevel.CATALOG, PrivLevel.DATABASE, PrivLevel.TABLE, PrivLevel.RESOURCE,
PrivLevel.WORKLOAD_GROUP)
.forEach(level -> {
String infoItem = infoMap.get(level);
if (Strings.isNullOrEmpty(infoItem)) {

42
fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
View File

@ -54,6 +54,7 @@ import org.junit.Before;
import org.junit.Test;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@ -2439,4 +2440,45 @@ public class AuthTest {
Assert.assertTrue(
auth.checkPlainPasswordForTest("root", "192.168.0.1", "validRootPassword", null));
}
@Test
public void testShowRoles() {
String role = "test_wg_role";
CreateRoleStmt roleStmt = new CreateRoleStmt(role);
try {
roleStmt.analyze(analyzer);
auth.createRole(roleStmt);
} catch (UserException e) {
e.printStackTrace();
Assert.fail();
}
AccessPrivilege accessPrivilege = AccessPrivilege.fromName("USAGE_PRIV");
AccessPrivilegeWithCols apwc = new AccessPrivilegeWithCols(accessPrivilege);
List<AccessPrivilegeWithCols> list = new ArrayList<>();
list.add(apwc);
WorkloadGroupPattern wgp = new WorkloadGroupPattern("test_wg");
GrantStmt grantStmt = new GrantStmt(null, role, wgp, list);
try {
grantStmt.analyze(analyzer);
auth.grant(grantStmt);
} catch (UserException e) {
e.printStackTrace();
Assert.fail();
}
List<List<String>> showInfo = auth.getRoleInfo();
boolean findWgPriv = false;
for (int i = 0; i < showInfo.size(); i++) {
List<String> row = showInfo.get(i);
String name = row.get(0);
if (role.equals(name)) {
findWgPriv = true;
String wgPriv = row.get(row.size() - 1);
Assert.assertTrue("test_wg: Usage_priv".equals(wgPriv));
}
}
Assert.assertTrue(findWgPriv);
}
}