Skip to content

feat(query): add other privilige check #10600

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
BohuTANG merged 2 commits into from
Mar 16, 2023
Merged

feat(query): add other privilige check #10600

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
b191822
feat(query): add other privilige check
TCeason Mar 16, 2023
7cc8abc
fix conversation
TCeason Mar 16, 2023
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
20 changes: 16 additions & 4 deletions src/meta/app/src/principal/user_grant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,21 @@ impl GrantEntry {
&self.privileges
}

pub fn verify_privilege(&self, object: &GrantObject, privilege: UserPrivilegeType) -> bool {
pub fn verify_privilege(
&self,
object: &GrantObject,
privileges: Vec<UserPrivilegeType>,
) -> bool {
// the verified object should be smaller than the object inside my grant entry.
if !self.object.contains(object) {
return false;
}

self.privileges.contains(privilege)
let mut priv_set = UserPrivilegeSet::empty();
for privilege in privileges {
priv_set.set_privilege(privilege)
}
self.privileges.contains(BitFlags::from(priv_set))
}

pub fn matches_entry(&self, object: &GrantObject) -> bool {
Expand Down Expand Up @@ -156,10 +164,14 @@ impl UserGrantSet {
self.roles.remove(role);
}

pub fn verify_privilege(&self, object: &GrantObject, privilege: UserPrivilegeType) -> bool {
pub fn verify_privilege(
&self,
object: &GrantObject,
privilege: Vec<UserPrivilegeType>,
) -> bool {
self.entries
.iter()
.any(|e| e.verify_privilege(object, privilege))
.any(|e| e.verify_privilege(object, privilege.clone()))
}

pub fn grant_privileges(&mut self, object: &GrantObject, privileges: UserPrivilegeSet) {
Expand Down
11 changes: 9 additions & 2 deletions src/meta/app/src/principal/user_privilege.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ pub enum UserPrivilegeType {
Grant = 1 << 12,
// Privilege to Create Stage.
CreateStage = 1 << 13,
// Privilege to Drop role.
DropRole = 1 << 14,
// Privilege to Drop user.
DropUser = 1 << 15,
// TODO: remove this later
Set = 1 << 4,
}
Expand All @@ -73,7 +77,9 @@ const ALL_PRIVILEGES: BitFlags<UserPrivilegeType> = make_bitflags!(
| Alter
| Super
| CreateUser
| DropUser
| CreateRole
| DropRole
| Grant
| CreateStage
| Set
Expand All @@ -93,7 +99,9 @@ impl std::fmt::Display for UserPrivilegeType {
UserPrivilegeType::Alter => "ALTER",
UserPrivilegeType::Super => "SUPER",
UserPrivilegeType::CreateUser => "CREATE USER",
UserPrivilegeType::DropUser => "DROP USER",
UserPrivilegeType::CreateRole => "CREATE ROLE",
UserPrivilegeType::DropRole => "DROP ROLE",
UserPrivilegeType::CreateStage => "CREATE STAGE",
UserPrivilegeType::Grant => "GRANT",
UserPrivilegeType::Set => "SET",
Expand Down Expand Up @@ -121,8 +129,7 @@ impl UserPrivilegeSet {
/// on databases and tables, and has some Global only privileges.
pub fn available_privileges_on_global() -> Self {
let database_privs = Self::available_privileges_on_database();
let privs =
make_bitflags!(UserPrivilegeType::{ Usage | Super | CreateUser | CreateRole | Grant });
let privs = make_bitflags!(UserPrivilegeType::{ Usage | Super | CreateUser | DropUser | CreateRole | DropRole | Grant });
(database_privs.privileges | privs).into()
}

Expand Down
30 changes: 15 additions & 15 deletions src/meta/app/tests/it/user_grant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ fn test_user_grant_entry() -> Result<()> {
);
assert!(grant.verify_privilege(
&GrantObject::Database("default".into(), "db1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grant.verify_privilege(
&GrantObject::Database("default".into(), "db1".into()),
UserPrivilegeType::Insert
vec![UserPrivilegeType::Insert]
));
assert!(grant.verify_privilege(
&GrantObject::Database("default".into(), "db2".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));

let grant = GrantEntry::new(
Expand All @@ -116,15 +116,15 @@ fn test_user_grant_entry() -> Result<()> {
);
assert!(grant.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grant.verify_privilege(
&GrantObject::Table("default".into(), "db2".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(grant.verify_privilege(
&GrantObject::Database("default".into(), "db1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));

let grant = GrantEntry::new(
Expand All @@ -133,19 +133,19 @@ fn test_user_grant_entry() -> Result<()> {
);
assert!(grant.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grant.verify_privilege(
&GrantObject::Table("default".into(), "db2".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grant.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Insert
vec![UserPrivilegeType::Insert]
));
assert!(grant.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));

Ok(())
Expand Down Expand Up @@ -180,23 +180,23 @@ fn test_user_grant_set() -> Result<()> {
assert_eq!(2, grants.entries().len());
assert!(grants.verify_privilege(
&GrantObject::Database("default".into(), "db1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grants.verify_privilege(
&GrantObject::Database("default".into(), "db1".into()),
UserPrivilegeType::Select
vec![UserPrivilegeType::Select]
));
assert!(grants.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Create
vec![UserPrivilegeType::Create]
));
assert!(!grants.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Insert
vec![UserPrivilegeType::Insert]
));
assert!(grants.verify_privilege(
&GrantObject::Table("default".into(), "db1".into(), "table1".into()),
UserPrivilegeType::Select
vec![UserPrivilegeType::Select]
));
Ok(())
}
4 changes: 3 additions & 1 deletion src/query/ast/src/parser/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,14 +1359,16 @@ pub fn priv_type(i: Input) -> IResult<UserPrivilegeType> {
value(UserPrivilegeType::Insert, rule! { INSERT }),
value(UserPrivilegeType::Update, rule! { UPDATE }),
value(UserPrivilegeType::Delete, rule! { DELETE }),
value(UserPrivilegeType::Drop, rule! { DROP }),
value(UserPrivilegeType::Alter, rule! { ALTER }),
value(UserPrivilegeType::Super, rule! { SUPER }),
value(UserPrivilegeType::CreateUser, rule! { CREATE ~ USER }),
value(UserPrivilegeType::DropUser, rule! { DROP ~ USER }),
value(UserPrivilegeType::CreateRole, rule! { CREATE ~ ROLE }),
value(UserPrivilegeType::DropRole, rule! { DROP ~ ROLE }),
value(UserPrivilegeType::Grant, rule! { GRANT }),
value(UserPrivilegeType::CreateStage, rule! { CREATE ~ STAGE }),
value(UserPrivilegeType::Set, rule! { SET }),
value(UserPrivilegeType::Drop, rule! { DROP }),
value(UserPrivilegeType::Create, rule! { CREATE }),
))(i)
}
Expand Down
4 changes: 2 additions & 2 deletions src/query/ast/tests/it/testdata/statement-error.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ error:
--> SQL:1:15
|
1 | GRANT SELECT, ALL PRIVILEGES, CREATE ON * TO 'test-grant'@'localhost';
| ----- ------ ^^^ expected `USAGE`, `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `DROP`, or 5 more ...
| ----- ------ ^^^ expected `USAGE`, `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `ALTER`, or 5 more ...
| | |
| | while parsing <privileges> ON <privileges_level>
| while parsing `GRANT { ROLE <role_name> | schemaObjectPrivileges | ALL [ PRIVILEGES ] ON <privileges_level> } TO { [ROLE <role_name>] | [USER] <user> }`
Expand Down Expand Up @@ -285,7 +285,7 @@ error:
--> SQL:1:24
|
1 | REVOKE SELECT, CREATE, ALL PRIVILEGES ON * FROM 'test-grant'@'localhost';
| ------ ------ ^^^ expected `USAGE`, `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `DROP`, or 5 more ...
| ------ ------ ^^^ expected `USAGE`, `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `ALTER`, or 5 more ...
| | |
| | while parsing <privileges> ON <privileges_level>
| while parsing `REVOKE { ROLE <role_name> | schemaObjectPrivileges | ALL [ PRIVILEGES ] ON <privileges_level> } FROM { [ROLE <role_name>] | [USER] <user> }`
Expand Down
Loading