diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index e453695065e83..62a3990c31999 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -67,7 +67,6 @@ private function fixDI() { public function createGroup(string $name): ?string { $this->fixDI(); - $name = $this->sanitizeGroupName($name); $gid = $this->computeGid($name); try { // Add group @@ -587,21 +586,12 @@ public function getBackendName(): string { return 'Database'; } - /** - * Merge any white spaces to a single space in group name, then trim it. - */ - private function sanitizeGroupName(string $displayName): string { - $cleanedDisplayName = preg_replace('/\s+/', ' ', $displayName); - return trim($cleanedDisplayName); - } - /** * Compute group ID from display name (GIDs are limited to 64 characters in database) */ private function computeGid(string $displayName): string { - $displayNameWithoutWhitespace = preg_replace('/\s+/', '_', $displayName); - return mb_strlen($displayNameWithoutWhitespace) > 64 - ? hash('sha256', $displayNameWithoutWhitespace) - : $displayNameWithoutWhitespace; + return mb_strlen($displayName) > 64 + ? hash('sha256', $displayName) + : $displayName; } } diff --git a/tests/lib/Group/DatabaseTest.php b/tests/lib/Group/DatabaseTest.php index 50661f7a6361a..b8ec53f0d0d4b 100644 --- a/tests/lib/Group/DatabaseTest.php +++ b/tests/lib/Group/DatabaseTest.php @@ -57,17 +57,4 @@ public function testAddLongGroupName(): void { $group = $this->backend->getGroupDetails($gidCreated); $this->assertEquals(['displayName' => $groupName], $group); } - - public function testWhiteSpaceInGroupName(): void { - $randomId = $this->getUniqueID('test_', 10); - $groupName = " group name with weird spaces \n" . $randomId; - $expectedGroupName = 'group name with weird spaces ' . $randomId; - $expectedGroupId = 'group_name_with_weird_spaces_' . $randomId; - - $gidCreated = $this->backend->createGroup($groupName); - $this->assertEquals($expectedGroupId, $gidCreated); - - $group = $this->backend->getGroupDetails($gidCreated); - $this->assertEquals(['displayName' => $expectedGroupName], $group); - } }