diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-12-20 16:56:16 +0100 |
---|---|---|
committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-12-22 08:47:12 +0000 |
commit | 68af059ebe72afddc28ebc452f3fa5dc4181f5ea (patch) | |
tree | 9534c54e9fde7a00df407af9cb39a92c5bc02cc5 | |
parent | 430b09589715220e77907fc1b9f3e0da8cfd30ff (diff) | |
download | nextcloud-server-68af059ebe72afddc28ebc452f3fa5dc4181f5ea.tar.gz nextcloud-server-68af059ebe72afddc28ebc452f3fa5dc4181f5ea.zip |
fix(LDAP): ensure stored groups are formatted as simple list
With array_unique it is possible that the keys are not in sequential order
but have gaps. json_encode then would store them as associative array,
which later on json_decode would result in a stdClass by default. This is
unexpected and would also contradict the return type hint.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
-rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 4 | ||||
-rw-r--r-- | apps/user_ldap/tests/Group_LDAPTest.php | 27 |
2 files changed, 29 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 999dc403c2f..a1943244d1f 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -683,7 +683,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I protected function getCachedGroupsForUserId(string $uid): array { $groupStr = $this->config->getUserValue($uid, 'user_ldap', 'cached-group-memberships-' . $this->access->connection->getConfigPrefix(), '[]'); - return json_decode($groupStr) ?? []; + return json_decode($groupStr, true) ?? []; } /** @@ -836,7 +836,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I return $groups; } - $groups = array_unique($groups, SORT_LOCALE_STRING); + $groups = array_values(array_unique($groups, SORT_LOCALE_STRING)); $this->access->connection->writeToCache($cacheKey, $groups); $groupStr = \json_encode($groups); diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 8d6c4539cec..e2698696bb0 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -901,6 +901,33 @@ class Group_LDAPTest extends TestCase { $this->assertTrue(in_array('groupF', $returnedGroups)); } + /** + * regression tests against a case where a json object was stored instead of expected list + * @see https://github.com/nextcloud/server/issues/42374 + */ + public function testGetUserGroupsOfflineUserUnexpectedJson() { + $this->enableGroups(); + + $offlineUser = $this->createMock(OfflineUser::class); + + $this->config->expects($this->any()) + ->method('getUserValue') + ->with('userX', 'user_ldap', 'cached-group-memberships-', $this->anything()) + // results in a json object: {"0":"groupB","2":"groupF"} + ->willReturn(\json_encode([0 => 'groupB', 2 => 'groupF'])); + + $this->access->userManager->expects($this->any()) + ->method('get') + ->with('userX') + ->willReturn($offlineUser); + + $this->initBackend(); + $returnedGroups = $this->groupBackend->getUserGroups('userX'); + $this->assertCount(2, $returnedGroups); + $this->assertTrue(in_array('groupB', $returnedGroups)); + $this->assertTrue(in_array('groupF', $returnedGroups)); + } + public function testGetUserGroupsUnrecognizedOfflineUser() { $this->enableGroups(); $dn = 'cn=userX,dc=foobar'; |