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

Merge pull request #1010 from AppFlowy-IO/revert-change-to-matcher 

fix: revert changes to casbin matcher
This commit is contained in:
Khor Shu Heng 2024-11-19 21:59:15 +08:00 committed by GitHub
parent c421f03da2 40835f00d1
commit 13cabec9c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/access-control/src/casbin/access.rs
View File

@ -159,7 +159,7 @@ g = _, _ # grouping rule
e = some(where (p.eft == allow))
[matchers]
m = g(r.sub, p.sub) && p.obj == r.obj && (g(p.act, r.act) || cmpRoleOrLevel(r.act, p.act))
m = r.sub == p.sub && p.obj == r.obj && (g(p.act, r.act) || cmpRoleOrLevel(r.act, p.act))
"###;
pub async fn casbin_model() -> Result<DefaultModel, AppError> {

42
libs/access-control/src/casbin/enforcer.rs
View File

@ -223,48 +223,6 @@ mod tests {
AFEnforcer::new(enforcer).await.unwrap()
}
#[tokio::test]
async fn collab_group_test() {
let enforcer = test_enforcer().await;
let uid = 1;
let group_id = "collab_owner_group:w1";
let workspace_id = "w1";
let object_1 = "o1";
// allow workspace member to access collab
enforcer
.update_policy(
SubjectType::Group(group_id.to_string()),
ObjectType::Collab(object_1),
ActionVariant::FromAccessLevel(&AFAccessLevel::FullAccess),
)
.await
.unwrap();
// include user in the collab owner group
enforcer
.add_grouping_policy(
&SubjectType::User(uid),
&SubjectType::Group(group_id.to_string()),
)
.await
.unwrap();
// when the user is the owner of the collab, then the user should have access to the collab
for action in [Action::Write, Action::Read] {
let result = enforcer
.enforce_policy(
workspace_id,
&uid,
ObjectType::Collab(object_1),
ActionVariant::FromAction(&action),
)
.await;
assert!(result.is_ok());
}
}
#[tokio::test]
async fn workspace_group_policy_test() {
let enforcer = test_enforcer().await;