-
Notifications
You must be signed in to change notification settings - Fork 600
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(frontend): support acl column in pg_namespace (#4326)
* inital * add get_acl_items() * add acl column * fix long line * fmt * fix ut * fix license & e2e test * remove check code * add user_privilege.rs add superuser acl check * fix format
- Loading branch information
Showing
8 changed files
with
221 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| query IT rowsort | ||
| SELECT nspname FROM pg_catalog.pg_namespace; | ||
| ---- | ||
| pg_catalog | ||
| public | ||
| pg_catalog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| // Copyright 2022 Singularity Data | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use itertools::Itertools; | ||
| use risingwave_common::catalog::DEFAULT_SUPER_USER_ID; | ||
| use risingwave_common::error::{ErrorCode, Result}; | ||
| use risingwave_pb::user::grant_privilege::{ | ||
| Action as ProstAction, ActionWithGrantOption, Object as ProstObject, | ||
| }; | ||
| use risingwave_pb::user::GrantPrivilege as ProstPrivilege; | ||
| use risingwave_sqlparser::ast::{Action, GrantObjects, Privileges}; | ||
|
|
||
| // TODO: add user_privilege mod under user manager and move check and expand logic there, and bitmap | ||
| // impl for privilege check. | ||
| static AVAILABLE_ACTION_ON_DATABASE: &[Action] = &[Action::Connect, Action::Create]; | ||
| static AVAILABLE_ACTION_ON_SCHEMA: &[Action] = &[Action::Create]; | ||
| static AVAILABLE_ACTION_ON_SOURCE: &[Action] = &[ | ||
| Action::Select { columns: None }, | ||
| Action::Update { columns: None }, | ||
| Action::Insert { columns: None }, | ||
| Action::Delete, | ||
| ]; | ||
| static AVAILABLE_ACTION_ON_MVIEW: &[Action] = &[Action::Select { columns: None }]; | ||
|
|
||
| pub fn check_privilege_type(privilege: &Privileges, objects: &GrantObjects) -> Result<()> { | ||
| match privilege { | ||
| Privileges::All { .. } => Ok(()), | ||
| Privileges::Actions(actions) => { | ||
| let valid = match objects { | ||
| GrantObjects::Databases(_) => actions | ||
| .iter() | ||
| .all(|action| AVAILABLE_ACTION_ON_DATABASE.contains(action)), | ||
| GrantObjects::Schemas(_) => actions | ||
| .iter() | ||
| .all(|action| AVAILABLE_ACTION_ON_SCHEMA.contains(action)), | ||
| GrantObjects::Sources(_) | GrantObjects::AllSourcesInSchema { .. } => actions | ||
| .iter() | ||
| .all(|action| AVAILABLE_ACTION_ON_SOURCE.contains(action)), | ||
| GrantObjects::Mviews(_) | GrantObjects::AllMviewsInSchema { .. } => actions | ||
| .iter() | ||
| .all(|action| AVAILABLE_ACTION_ON_MVIEW.contains(action)), | ||
| _ => true, | ||
| }; | ||
| if !valid { | ||
| return Err(ErrorCode::BindError( | ||
| "Invalid privilege type for the given object.".to_string(), | ||
| ) | ||
| .into()); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn available_privilege_actions(objects: &GrantObjects) -> Result<Vec<Action>> { | ||
| match objects { | ||
| GrantObjects::Databases(_) => Ok(AVAILABLE_ACTION_ON_DATABASE.to_vec()), | ||
| GrantObjects::Schemas(_) => Ok(AVAILABLE_ACTION_ON_SCHEMA.to_vec()), | ||
| GrantObjects::Sources(_) | GrantObjects::AllSourcesInSchema { .. } => { | ||
| Ok(AVAILABLE_ACTION_ON_SOURCE.to_vec()) | ||
| } | ||
| GrantObjects::Mviews(_) | GrantObjects::AllMviewsInSchema { .. } => { | ||
| Ok(AVAILABLE_ACTION_ON_MVIEW.to_vec()) | ||
| } | ||
| _ => Err( | ||
| ErrorCode::BindError("Invalid privilege type for the given object.".to_string()).into(), | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| #[inline(always)] | ||
| pub fn get_prost_action(action: &Action) -> ProstAction { | ||
| match action { | ||
| Action::Select { .. } => ProstAction::Select, | ||
| Action::Insert { .. } => ProstAction::Insert, | ||
| Action::Update { .. } => ProstAction::Update, | ||
| Action::Delete { .. } => ProstAction::Delete, | ||
| Action::Connect => ProstAction::Connect, | ||
| Action::Create => ProstAction::Create, | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
|
|
||
| pub fn available_prost_privilege(object: ProstObject) -> ProstPrivilege { | ||
| let actions = match object { | ||
| ProstObject::DatabaseId(_) => AVAILABLE_ACTION_ON_DATABASE.to_vec(), | ||
| ProstObject::SchemaId(_) => AVAILABLE_ACTION_ON_SCHEMA.to_vec(), | ||
| ProstObject::SourceId(_) | ProstObject::AllSourcesSchemaId { .. } => { | ||
| AVAILABLE_ACTION_ON_SOURCE.to_vec() | ||
| } | ||
| ProstObject::TableId(_) | ProstObject::AllTablesSchemaId { .. } => { | ||
| AVAILABLE_ACTION_ON_MVIEW.to_vec() | ||
| } | ||
| }; | ||
| let actions = actions | ||
| .iter() | ||
| .map(|action| ActionWithGrantOption { | ||
| action: get_prost_action(action) as i32, | ||
| with_grant_option: false, | ||
| granted_by: DEFAULT_SUPER_USER_ID, | ||
| }) | ||
| .collect_vec(); | ||
| ProstPrivilege { | ||
| action_with_opts: actions, | ||
| object: Some(object), | ||
| } | ||
| } |
Oops, something went wrong.