morningman commented on code in PR #33320:
URL: https://github.com/apache/doris/pull/33320#discussion_r1555638451
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/CleanQueryStatsStmt.java:
##########
@@ -95,7 +96,8 @@ public void analyze(Analyzer analyzer) throws UserException {
Env.getCurrentEnv().getCurrentCatalog().getDbOrAnalysisException(dbName);
if (!Env.getCurrentEnv().getAccessManager()
- .checkDbPriv(ConnectContext.get(), dbName,
PrivPredicate.ALTER)) {
+ .checkDbPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, dbName,
Review Comment:
No external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java:
##########
@@ -73,9 +74,10 @@ public void analyze(Analyzer analyzer) throws UserException {
analyzer.getQualifiedUser(), dbName);
}
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(ConnectContext.get(),
dbName, PrivPredicate.DROP)) {
+ if (!Env.getCurrentEnv().getAccessManager()
+ .checkDbPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, dbName, PrivPredicate.DROP)) {
Review Comment:
External catalog
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeTblStmt.java:
##########
@@ -295,7 +296,7 @@ private void checkAnalyzePriv(String dbName, String
tblName) throws AnalysisExce
return;
}
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ctx, dbName, tblName, PrivPredicate.SELECT)) {
+ .checkTblPriv(ctx, InternalCatalog.INTERNAL_CATALOG_NAME,
dbName, tblName, PrivPredicate.SELECT)) {
Review Comment:
analyze table should support external table?
##########
fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java:
##########
@@ -227,15 +228,17 @@ protected void checkGlobalAuth(UserIdentity currentUser,
PrivPredicate predicate
protected void checkDbAuth(UserIdentity currentUser, String db,
PrivPredicate predicate)
throws UnauthorizedException {
- if (!Env.getCurrentEnv().getAccessManager().checkDbPriv(currentUser,
db, predicate)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowAnalyzeStmt.java:
##########
@@ -144,7 +145,8 @@ public RedirectStatus getRedirectStatus() {
private void checkShowAnalyzePriv(String dbName, String tblName) throws
AnalysisException {
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ConnectContext.get(), dbName, tblName,
PrivPredicate.SHOW)) {
+ .checkTblPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, dbName, tblName,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/cloud/analysis/UseCloudClusterStmt.java:
##########
@@ -100,7 +101,9 @@ public void analyze(Analyzer analyzer) throws
AnalysisException, UserException {
if (Strings.isNullOrEmpty(database)) {
return;
}
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(ConnectContext.get(),
database, PrivPredicate.SHOW)) {
+ if (!Env.getCurrentEnv().getAccessManager()
+ .checkDbPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, database,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateDbStmt.java:
##########
@@ -57,8 +58,9 @@ public void analyze(Analyzer analyzer) throws
AnalysisException, UserException {
ErrorReport.reportAnalysisException(ErrorCode.ERR_WRONG_DB_NAME,
db);
}
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(ConnectContext.get(), db,
- PrivPredicate.ALTER_CREATE_DROP)) {
+ if (!Env.getCurrentEnv().getAccessManager()
+ .checkDbPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, db,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTypeCastStmt.java:
##########
@@ -70,7 +71,8 @@ public void analyze(Analyzer analyzer) throws UserException {
}
}
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(ConnectContext.get(),
dbName, PrivPredicate.SHOW)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
Remove `db` of this stmt, it is useless and no need to check priv for this
stmt
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertOverwriteTableCommand.java:
##########
@@ -131,7 +132,8 @@ public void run(ConnectContext ctx, StmtExecutor executor)
throws Exception {
.checkDatabase(((OlapTable)
targetTable).getQualifiedDbName(), ConnectContext.get());
// check auth
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ConnectContext.get(), ((OlapTable)
targetTable).getQualifiedDbName(),
+ .checkTblPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -601,8 +603,9 @@ public TListTableStatusResult
listTableStatus(TGetTablesParams params) throws TE
}
}
for (TableIf table : tables) {
- if
(!Env.getCurrentEnv().getAccessManager().checkTblPriv(currentUser, dbName,
- table.getName(), PrivPredicate.SHOW)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -2317,21 +2323,24 @@ public TCheckAuthResult checkAuth(TCheckAuthRequest
request) throws TException {
}
} else if (privHier == TPrivilegeHier.DATABASE) {
String fullDbName = privCtrl.getDb();
- if (!accessManager.checkDbPriv(currentUser.get(0), fullDbName,
predicate)) {
+ if (!accessManager.checkDbPriv(currentUser.get(0),
InternalCatalog.INTERNAL_CATALOG_NAME, fullDbName,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -1083,7 +1086,8 @@ private void checkPasswordAndPrivs(String user, String
passwd, String db, List<S
Preconditions.checkState(currentUser.size() == 1);
if (tables == null || tables.isEmpty()) {
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(currentUser.get(0),
fullDbName, predicate)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -1092,7 +1096,9 @@ private void checkPasswordAndPrivs(String user, String
passwd, String db, List<S
}
for (String tbl : tables) {
- if
(!Env.getCurrentEnv().getAccessManager().checkTblPriv(currentUser.get(0),
fullDbName, tbl, predicate)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertJob.java:
##########
@@ -556,15 +557,17 @@ private void checkAuthWithoutAuthInfo(String command)
throws DdlException {
// check auth
if (tableNames == null || tableNames.isEmpty()) {
// forward compatibility
- if
(!Env.getCurrentEnv().getAccessManager().checkDbPriv(ConnectContext.get(),
db.getFullName(),
- PrivPredicate.LOAD)) {
+ if (!Env.getCurrentEnv().getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/DropStatsStmt.java:
##########
@@ -175,7 +175,8 @@ public String toString() {
private void checkAnalyzePriv(String dbName, String tblName) throws
AnalysisException {
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ConnectContext.get(), dbName, tblName,
PrivPredicate.DROP)) {
+ .checkTblPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME, dbName, tblName,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -452,7 +452,8 @@ public TGetDbsResult getDbNames(TGetDbsParams params)
throws TException {
}
for (DatabaseIf db : dbs) {
String dbName = db.getFullName();
- if (!env.getAccessManager().checkDbPriv(currentUser, dbName,
PrivPredicate.SHOW)) {
+ if (!env.getAccessManager()
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/BatchInsertIntoTableCommand.java:
##########
@@ -131,7 +132,8 @@ public void run(ConnectContext ctx, StmtExecutor executor)
throws Exception {
}
// check auth
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ConnectContext.get(),
targetTable.getQualifiedDbName(), targetTable.getName(),
+ .checkTblPriv(ConnectContext.get(),
InternalCatalog.INTERNAL_CATALOG_NAME,
Review Comment:
external catalog?
##########
fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java:
##########
@@ -537,7 +538,8 @@ public TGetTablesResult getTableNames(TGetTablesParams
params) throws TException
LOG.debug("get table: {}, wait to check", tableName);
}
if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(currentUser, dbName, tableName,
PrivPredicate.SHOW)) {
+ .checkTblPriv(currentUser,
InternalCatalog.INTERNAL_CATALOG_NAME, dbName, tableName,
Review Comment:
external catalog?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
