chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1007 from AppFlowy-IO/disable-loading-collab-policy 

fix: stop loading collab policies to improve access control evaluation
This commit is contained in:
Khor Shu Heng 2024-11-19 14:57:32 +08:00 committed by GitHub
parent 0818cf7565 00a6189cf3
commit c421f03da2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/access-control/src/casbin/adapter.rs
View File

@ -7,8 +7,6 @@ use casbin::Filter;
use casbin::Model;
use casbin::Result;
use database::collab::select_collab_member_access_level;
use database::pg_row::AFCollabMemberAccessLevelRow;
use database::pg_row::AFWorkspaceMemberPermRow;
use database::workspace::select_workspace_member_perm_stream;
@ -35,28 +33,6 @@ impl PgAdapter {
}
}
async fn load_collab_policies(
mut stream: BoxStream<'_, sqlx::Result<AFCollabMemberAccessLevelRow>>,
) -> Result<Vec<Vec<String>>> {
let mut policies: Vec<Vec<String>> = Vec::new();
while let Some(Ok(member_access_lv)) = stream.next().await {
let uid = member_access_lv.uid;
let object_type = ObjectType::Collab(&member_access_lv.oid);
for act in member_access_lv.access_level.policy_acts() {
let policy = [
uid.to_string(),
object_type.policy_object(),
act.to_string(),
]
.to_vec();
policies.push(policy);
}
}
Ok(policies)
}
/// Loads workspace policies from a given stream of workspace member permissions.
///
/// This function iterates over the stream of member permissions, constructing and accumulating
@ -128,12 +104,6 @@ impl Adapter for PgAdapter {
// Policy definition `p` of type `p`. See `model.conf`
model.add_policies("p", "p", workspace_policies);
let collab_member_access_lv_stream = select_collab_member_access_level(&self.pg_pool);
let collab_policies = load_collab_policies(collab_member_access_lv_stream).await?;
// Policy definition `p` of type `p`. See `model.conf`
model.add_policies("p", "p", collab_policies);
self
.access_control_metrics
.record_load_all_policies_in_ms(start.elapsed().as_millis() as u64);