Skip to content

[stable10] Restrict group admin create groups using userprovision API #31738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharidas merged 1 commit into from
Jun 12, 2018
Merged

[stable10] Restrict group admin create groups using userprovision API #31738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions apps/provisioning_api/lib/Groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ public function getGroup($parameters) {
}, $users);
$users = array_values($users);
return new OC_OCS_Result(['users' => $users]);
} else {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'User does not have access to specified group');
}
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'User does not have access to specified group');
}

/**
Expand All @@ -138,8 +137,17 @@ public function addGroup($parameters) {
if($this->groupManager->groupExists($groupId)){
return new OC_OCS_Result(null, 102);
}
$this->groupManager->createGroup($groupId);
return new OC_OCS_Result(null, 100);
$user = $this->userSession->getUser();
if ($user === null) {
return new OC_OCS_Result(null, 102);
}
// Only admin has got privilege to create group
if ($this->groupManager->isAdmin($user->getUID())) {
$this->groupManager->createGroup($groupId);
return new OC_OCS_Result(null, 100);
}

return new OC_OCS_Result(null, 997);
}

/**
Expand All @@ -150,12 +158,12 @@ public function deleteGroup($parameters) {
// Check it exists
if(!$this->groupManager->groupExists($parameters['groupid'])){
return new OC_OCS_Result(null, 101);
} else if($parameters['groupid'] === 'admin' || !$this->groupManager->get($parameters['groupid'])->delete()){
}
if($parameters['groupid'] === 'admin' || !$this->groupManager->get($parameters['groupid'])->delete()){
// Cannot delete admin group
return new OC_OCS_Result(null, 102);
} else {
return new OC_OCS_Result(null, 100);
}
return new OC_OCS_Result(null, 100);
}

/**
Expand Down
80 changes: 80 additions & 0 deletions apps/provisioning_api/tests/GroupsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use OCP\API;
use OCP\IGroupManager;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;

class GroupsTest extends \Test\TestCase {
Expand Down Expand Up @@ -365,6 +366,58 @@ public function testAddGroupExistingGroup() {
$this->assertEquals(102, $result->getStatusCode());
}

public function testAddGroupUserDoesNotExist() {
$this->request
->method('getParam')
->with('groupid')
->willReturn('NewGroup');

$this->groupManager
->method('groupExists')
->with('NewGroup')
->willReturn(false);

$this->userSession
->expects($this->once())
->method('getUser')
->willReturn(null);

$result = $this->api->addGroup([]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(102, $result->getStatusCode());
}

public function testAddGroupUserNotAdmin() {
$this->request
->method('getParam')
->with('groupid')
->willReturn('NewGroup');

$this->groupManager
->method('groupExists')
->with('NewGroup')
->willReturn(false);

$this->groupManager->expects($this->once())
->method('isAdmin')
->willReturn(false);

$iUser = $this->createMock(IUser::class);
$iUser->expects($this->once())
->method('getUID')
->willReturn('user1');
$this->userSession
->expects($this->once())
->method('getUser')
->willReturn($iUser);

$result = $this->api->addGroup([]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(997, $result->getStatusCode());
}

public function testAddGroup() {
$this->request
->method('getParam')
Expand All @@ -381,6 +434,19 @@ public function testAddGroup() {
->method('createGroup')
->with('NewGroup');

$this->groupManager->expects($this->once())
->method('isAdmin')
->willReturn(true);

$iUser = $this->createMock(IUser::class);
$iUser->expects($this->once())
->method('getUID')
->willReturn('user1');
$this->userSession
->expects($this->once())
->method('getUser')
->willReturn($iUser);

$result = $this->api->addGroup([]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
Expand All @@ -402,6 +468,19 @@ public function testAddGroupWithSpecialChar() {
->method('createGroup')
->with('Iñtërnâtiônàlizætiøn');

$this->groupManager->expects($this->once())
->method('isAdmin')
->willReturn(true);

$iUser = $this->createMock(IUser::class);
$iUser->expects($this->once())
->method('getUID')
->willReturn('user1');
$this->userSession
->expects($this->once())
->method('getUser')
->willReturn($iUser);

$result = $this->api->addGroup([]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
Expand Down Expand Up @@ -451,5 +530,6 @@ public function testDeleteGroup() {
]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertEquals(100, $result->getStatusCode());
}
}
5 changes: 2 additions & 3 deletions tests/acceptance/features/apiProvisioning-v1/addGroup.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ So that I can more easily manage access to resources by groups rather than indiv
And the HTTP status code should be "401"
And group "new-group" should not exist

@skip @issue-31283
Scenario: subadmin tries to create a group
Given user "subadmin" has been created
And group "new-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
And user "subadmin" sends HTTP method "POST" to API endpoint "/cloud/groups" with body
| groupid | another-group |
Then the OCS status code should be "102"
And the HTTP status code should be "200"
Then the OCS status code should be "997"
And the HTTP status code should be "401"
And group "another-group" should not exist
3 changes: 1 addition & 2 deletions tests/acceptance/features/apiProvisioning-v2/addGroup.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,12 @@ So that I can more easily manage access to resources by groups rather than indiv
And the HTTP status code should be "401"
And group "new-group" should not exist

@skip @issue-31283
Scenario: subadmin tries to create a group
Given user "subadmin" has been created
And group "new-group" has been created
And user "subadmin" has been made a subadmin of group "new-group"
And user "subadmin" sends HTTP method "POST" to API endpoint "/cloud/groups" with body
| groupid | another-group |
Then the OCS status code should be "401"
Then the OCS status code should be "997"
And the HTTP status code should be "401"
And group "another-group" should not exist