cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [ACL] fix permissions for org admins 

- also, fix a bug with the simple permissions being ignored
pull/79/head
iglocska 2021-11-24 01:29:39 +01:00
parent dad310f434
commit 5483357e1c
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Controller/Component/ACLComponent.php
View File

@ -145,24 +145,24 @@ class ACLComponent extends Component
'view' => ['*'] 'view' => ['*']
], ],
'SharingGroups' => [ 'SharingGroups' => [
'add' => ['perm_admin'], 'add' => ['perm_org_admin'],
'addOrg' => ['perm_admin'], 'addOrg' => ['perm_org_admin'],
'delete' => ['perm_admin'], 'delete' => ['perm_org_admin'],
'edit' => ['perm_admin'], 'edit' => ['perm_org_admin'],
'index' => ['*'], 'index' => ['*'],
'listOrgs' => ['*'], 'listOrgs' => ['*'],
'removeOrg' => ['perm_admin'], 'removeOrg' => ['perm_org_admin'],
'view' => ['*'] 'view' => ['*']
], ],
'Users' => [ 'Users' => [
'add' => ['perm_admin'], 'add' => ['perm_org_admin'],
'delete' => ['perm_admin'], 'delete' => ['perm_org_admin'],
'edit' => ['*'], 'edit' => ['*'],
'index' => ['perm_admin'], 'index' => ['perm_org_admin'],
'login' => ['*'], 'login' => ['*'],
'logout' => ['*'], 'logout' => ['*'],
'register' => ['*'], 'register' => ['*'],
'toggle' => ['perm_admin'], 'toggle' => ['perm_org_admin'],
'view' => ['*'] 'view' => ['*']
] ]
); );
@ -290,6 +290,12 @@ class ACLComponent extends Component
if ($allConditionsMet) { if ($allConditionsMet) {
return true; return true;
} }
} else {
foreach ($this->aclList[$controller][$action] as $permission) {
if ($this->user['role'][$permission]) {
return true;
}
}
} }
} }
return false; return false;