Remove unnecessary group name validation
This commit is contained in:
parent
a0345b9465
commit
673a8a1e4a
|
@ -130,7 +130,7 @@ class Groups{
|
||||||
public function addGroup($parameters) {
|
public function addGroup($parameters) {
|
||||||
// Validate name
|
// Validate name
|
||||||
$groupId = $this->request->getParam('groupid', '');
|
$groupId = $this->request->getParam('groupid', '');
|
||||||
if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $groupId ) || empty($groupId)){
|
if(empty($groupId)){
|
||||||
\OCP\Util::writeLog('provisioning_api', 'Attempt made to create group using invalid characters.', \OCP\Util::ERROR);
|
\OCP\Util::writeLog('provisioning_api', 'Attempt made to create group using invalid characters.', \OCP\Util::ERROR);
|
||||||
return new OC_OCS_Result(null, 101, 'Invalid group name');
|
return new OC_OCS_Result(null, 101, 'Invalid group name');
|
||||||
}
|
}
|
||||||
|
|
|
@ -373,6 +373,27 @@ class GroupsTest extends \Test\TestCase {
|
||||||
$this->assertTrue($result->succeeded());
|
$this->assertTrue($result->succeeded());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testAddGroupWithSpecialChar() {
|
||||||
|
$this->request
|
||||||
|
->method('getParam')
|
||||||
|
->with('groupid')
|
||||||
|
->willReturn('Iñtërnâtiônàlizætiøn');
|
||||||
|
|
||||||
|
$this->groupManager
|
||||||
|
->method('groupExists')
|
||||||
|
->with('NewGroup')
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
|
$this->groupManager
|
||||||
|
->expects($this->once())
|
||||||
|
->method('createGroup')
|
||||||
|
->with('Iñtërnâtiônàlizætiøn');
|
||||||
|
|
||||||
|
$result = $this->api->addGroup([]);
|
||||||
|
$this->assertInstanceOf('OC_OCS_Result', $result);
|
||||||
|
$this->assertTrue($result->succeeded());
|
||||||
|
}
|
||||||
|
|
||||||
public function testDeleteGroupNonExisting() {
|
public function testDeleteGroupNonExisting() {
|
||||||
$result = $this->api->deleteGroup([
|
$result = $this->api->deleteGroup([
|
||||||
'groupid' => 'NonExistingGroup'
|
'groupid' => 'NonExistingGroup'
|
||||||
|
|
Loading…
Reference in New Issue