Skip to content

[enhance](auth)When authorization includes create, not check if resources exist #45125

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
morningman merged 2 commits into from
Dec 8, 2024
Merged

[enhance](auth)When authorization includes create, not check if resources exist #45125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c11d3
1
zddr Dec 6, 2024
7c2cbdf
add case
zddr Dec 6, 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
8 changes: 6 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/Auth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ private void grantInternal(UserIdentity userIdent, String role, TablePattern tbl
writeLock();
try {
if (!isReplay) {
checkTablePatternExist(tblPattern);
checkTablePatternExist(tblPattern, privs);
}
if (role == null) {
if (!doesUserExist(userIdent)) {
Expand All @@ -706,8 +706,12 @@ private void grantInternal(UserIdentity userIdent, String role, TablePattern tbl
}
}

private void checkTablePatternExist(TablePattern tablePattern) throws DdlException {
private void checkTablePatternExist(TablePattern tablePattern, PrivBitSet privs) throws DdlException {
Objects.requireNonNull(tablePattern, "tablePattern can not be null");
Objects.requireNonNull(privs, "privs can not be null");
if (privs.containsPrivs(Privilege.CREATE_PRIV)) {
return;
}
PrivLevel privLevel = tablePattern.getPrivLevel();
if (privLevel == PrivLevel.GLOBAL) {
return;
Expand Down
4 changes: 3 additions & 1 deletion regression-test/suites/auth_p0/test_grant_nonexist_table.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ suite("test_grant_nonexist_table","p0,auth") {
sql """grant select_priv on internal.${dbName}.non_exist_table to ${user}"""
exception "table"
}

// contain create_triv should not check name, Same behavior as MySQL
sql """grant create_priv on internal.${dbName}.non_exist_table to ${user}"""
sql """grant create_priv,select_priv on internal.${dbName}.non_exist_table to ${user}"""

try_sql("DROP USER ${user}")
}
Loading