tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #375 from halkyon/onchangegroups_bug

Browse Source 
Member::onChangeGroups() should allow ADMIN permission grant if logged in user is admin
This commit is contained in:
Sam Minnée 2012-04-26 20:26:39 -07:00
commit cbc5d3c5e8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Member.php
View File

@ -703,8 +703,8 @@ class Member extends DataObject implements TemplateGlobalProvider {
*/ */
function onChangeGroups($ids) { function onChangeGroups($ids) {
// Filter out admin groups to avoid privilege escalation, // Filter out admin groups to avoid privilege escalation,
// unless the current user is an admin already // unless the current user is an admin already OR the logged in user is an admin
if(!Permission::checkMember($this, 'ADMIN')) { if(!(Permission::check('ADMIN') || Permission::checkMember($this, 'ADMIN'))) {
$adminGroups = Permission::get_groups_by_permission('ADMIN'); $adminGroups = Permission::get_groups_by_permission('ADMIN');
$adminGroupIDs = ($adminGroups) ? $adminGroups->column('ID') : array(); $adminGroupIDs = ($adminGroups) ? $adminGroups->column('ID') : array();
return count(array_intersect($ids, $adminGroupIDs)) == 0; return count(array_intersect($ids, $adminGroupIDs)) == 0;

8
tests/security/MemberTest.php
View File

@ -551,6 +551,14 @@ class MemberTest extends FunctionalTest {
$staffMember->onChangeGroups(array($newAdminGroup->ID)), $staffMember->onChangeGroups(array($newAdminGroup->ID)),
'Adding new admin group relation is not allowed for non-admin members' 'Adding new admin group relation is not allowed for non-admin members'
); );
$this->session()->inst_set('loggedInAs', $adminMember->ID);
$this->assertTrue(
$staffMember->onChangeGroups(array($newAdminGroup->ID)),
'Adding new admin group relation is allowed for normal users, when granter is logged in as admin'
);
$this->session()->inst_set('loggedInAs', null);
$this->assertTrue( $this->assertTrue(
$adminMember->onChangeGroups(array($newAdminGroup->ID)), $adminMember->onChangeGroups(array($newAdminGroup->ID)),
'Adding new admin group relation is allowed for admin members' 'Adding new admin group relation is allowed for admin members'