diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-09-18 12:55:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 12:55:25 +0200 |
| commit | 27ad83f541d7adbcce307e4037265bb109aa5746 (patch) | |
| tree | 2eeba534b2c1075ccc154200e337a66d44614d8a /apps | |
| parent | 60e0de4a36be29ec787860808bf61a115ef4adfb (diff) | |
| parent | a62b4a68a060845ff5b37e0b5040ebcf13f49e6c (diff) | |
| download | nextcloud-server-27ad83f541d7adbcce307e4037265bb109aa5746.tar.gz nextcloud-server-27ad83f541d7adbcce307e4037265bb109aa5746.zip | |
Merge pull request #6545 from nextcloud/provapi-fix-empty-gid-exception
throw 101 when an empty group string is provided
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/Controller/UsersControllerTest.php | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 25cc13d1c32..e165457a339 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -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); } diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 19b5fa65e9a..692b94556c5 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -2119,6 +2119,20 @@ class UsersControllerTest extends TestCase { /** * @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 */ public function testRemoveFromGroupWithNotExistingTargetGroup() { |