mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6547 from nextcloud/backport-6545-stable12 

[stable12] throw 101 when an empty group string is provided
This commit is contained in:
Morris Jobke 2017-09-20 16:05:41 +02:00 committed by GitHub
parent 3c449c88be 713ce42fdf
commit 6a52cda551
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/provisioning_api/lib/Controller/UsersController.php
View File

@ -604,7 +604,7 @@ class UsersController extends OCSController {
public function removeFromGroup($userId, $groupid) {
$loggedInUser = $this->userSession->getUser();
if($groupid === null) {
if($groupid === null || trim($groupid) === '') {
throw new OCSException('', 101);
}

14
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View File

@ -2117,6 +2117,20 @@ class UsersControllerTest extends TestCase {
$this->api->removeFromGroup('TargetUser', null);
}
/**
* @expectedException \OCP\AppFramework\OCS\OCSException
* @expectedExceptionCode 101
*/
public function testRemoveFromGroupWithEmptyTargetGroup() {
$loggedInUser = $this->getMockBuilder('\OCP\IUser')->disableOriginalConstructor()->getMock();
$this->userSession
->expects($this->once())
->method('getUser')
->will($this->returnValue($loggedInUser));
$this->api->removeFromGroup('TargetUser', '');
}
/**
* @expectedException \OCP\AppFramework\OCS\OCSException
* @expectedExceptionCode 102