Skip to content
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

Jump to bottom

[fix](auth)Fix no auth,but can select count(*) #35465

Merged
merged 3 commits into from
May 29, 2024
Merged

[fix](auth)Fix no auth,but can select count(*) #35465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a566da4
1
zddr May 27, 2024
075194e
1
zddr May 27, 2024
020673c
1
zddr May 28, 2024
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: 16 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/UserAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@

package org.apache.doris.nereids.rules.analysis;

import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.mysql.privilege.AccessControllerManager;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;

import org.apache.commons.collections.CollectionUtils;

import java.util.Set;

/**
Expand Down Expand Up @@ -52,7 +58,15 @@ public static void checkPermission(TableIf table, ConnectContext connectContext,
return;
}
String ctlName = catalog.getName();
connectContext.getEnv().getAccessManager().checkColumnsPriv(
connectContext.getCurrentUserIdentity(), ctlName, dbName, tableName, columns, PrivPredicate.SELECT);
AccessControllerManager accessManager = connectContext.getEnv().getAccessManager();
UserIdentity userIdentity = connectContext.getCurrentUserIdentity();
if (CollectionUtils.isEmpty(columns)) {
if (!accessManager.checkTblPriv(userIdentity, ctlName, dbName, tableName, PrivPredicate.SELECT)) {
ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLE_ACCESS_DENIED_ERROR,
PrivPredicate.SELECT.getPrivs().toString(), tableName);
}
} else {
accessManager.checkColumnsPriv(userIdentity, ctlName, dbName, tableName, columns, PrivPredicate.SELECT);
}
}
}
10 changes: 10 additions & 0 deletions regression-test/suites/account_p0/test_nereids_authentication.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ suite("test_nereids_authentication", "query") {
}
}

connect(user=user, password='Doris_123456', url=url) {
test {
sql "SELECT count(*) FROM ${tableName2}"
exception "denied"
}
}

connect(user=user, password='Doris_123456', url=url) {
test {
sql "SELECT * FROM ${tableName1}, ${tableName2} WHERE ${tableName1}.`key` = ${tableName2}.`key`"
Expand All @@ -78,6 +85,9 @@ suite("test_nereids_authentication", "query") {
sql "SELECT * FROM ${tableName2}"
}
assertEquals(result.size(), 0)
connect(user=user, password='Doris_123456', url=url) {
sql "SELECT count(*) FROM ${tableName2}"
}
connect(user=user, password='Doris_123456', url=url) {
sql "SELECT * FROM ${tableName1}, ${tableName2} WHERE ${tableName1}.`key` = ${tableName2}.`key`"
}
Expand Down
Loading