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

[opt](privilege) Grant check name (#39597) (#39856)

Browse Source 
pick https://github.com/apache/doris/pull/39597
This commit is contained in:
zhangdong
2024-08-26 09:53:45 +08:00
committed by GitHub
parent 4c1c67e03a
commit d87a220d2b
7 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/Auth.java
View File

@ -35,8 +35,10 @@ import org.apache.doris.analysis.SetUserPropertyStmt;
import org.apache.doris.analysis.TablePattern;
import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.analysis.WorkloadGroupPattern;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.InfoSchemaDb;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.AuthenticationException;
@ -51,6 +53,7 @@ import org.apache.doris.common.Pair;
import org.apache.doris.common.PatternMatcherException;
import org.apache.doris.common.UserException;
import org.apache.doris.common.io.Writable;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.mysql.MysqlPassword;
import org.apache.doris.mysql.authenticate.AuthenticateType;
@ -83,6 +86,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
@ -593,6 +597,7 @@ public class Auth implements Writable {
throws DdlException {
writeLock();
try {
checkTablePatternExist(tblPattern);
if (role == null) {
if (!doesUserExist(userIdent)) {
throw new DdlException("user " + userIdent + " does not exist");
@ -611,6 +616,32 @@ public class Auth implements Writable {
}
}
private void checkTablePatternExist(TablePattern tablePattern) throws DdlException {
Objects.requireNonNull(tablePattern, "tablePattern can not be null");
PrivLevel privLevel = tablePattern.getPrivLevel();
if (privLevel == PrivLevel.GLOBAL) {
return;
}
CatalogIf catalog = Env.getCurrentEnv().getCatalogMgr().getCatalog(tablePattern.getQualifiedCtl());
if (catalog == null) {
throw new DdlException("catalog:" + tablePattern.getQualifiedCtl() + " does not exist");
}
if (privLevel == PrivLevel.CATALOG) {
return;
}
DatabaseIf db = catalog.getDbNullable(tablePattern.getQualifiedDb());
if (db == null) {
throw new DdlException("database:" + tablePattern.getQualifiedDb() + " does not exist");
}
if (privLevel == PrivLevel.DATABASE) {
return;
}
TableIf table = db.getTableNullable(tablePattern.getTbl());
if (table == null) {
throw new DdlException("table:" + tablePattern.getTbl() + " does not exist");
}
}
// grant for ResourcePattern
private void grantInternal(UserIdentity userIdent, String role, ResourcePattern resourcePattern, PrivBitSet privs,
boolean errOnNonExist, boolean isReplay) throws DdlException {