Merge pull request #42448 from nextcloud/backport/42405/stable26

[stable26] fix(LDAP): ensure stored groups are formatted as simple list
nextcloud · Jan 2, 2024 · 6169753 · 6169753
2 parents b912b47 + 1d1d5e1
commit 6169753
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
@@ -681,7 +681,7 @@ private function isUserOnLDAP(string $uid): bool {
 
 	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) ?? [];
 	}
 
 	/**
@@ -834,7 +834,7 @@ public function getUserGroups($uid): array {
 			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
@@ -901,6 +901,33 @@ public function testGetUserGroupsOfflineUser() {
 		$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';