Merge pull request #44481 from nextcloud/backport/44276/stable23

[stable23] fix(config): Make sure user keys are strings
nextcloud · Mar 28, 2024 · d19ad7f · d19ad7f
2 parents acc07c8 + 8765222
commit d19ad7f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -333,7 +333,7 @@ public function getUserValue($userId, $appName, $key, $default = '') {
 	public function getUserKeys($userId, $appName) {
 		$data = $this->getUserValues($userId);
 		if (isset($data[$appName])) {
-			return array_keys($data[$appName]);
+			return array_map('strval', array_keys($data[$appName]));
 		} else {
 			return [];
 		}

diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php
@@ -278,6 +278,31 @@ public function testGetUserKeys() {
 		$this->connection->executeUpdate('DELETE FROM `*PREFIX*preferences`');
 	}
 
+	public function testGetUserKeysAllInts() {
+		$config = $this->getConfig();
+
+		// preparation - add something to the database
+		$data = [
+			['userFetch', 'appFetch1', '123', 'value'],
+			['userFetch', 'appFetch1', '456', 'value'],
+		];
+		foreach ($data as $entry) {
+			$this->connection->executeUpdate(
+				'INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, ' .
+				'`configkey`, `configvalue`) VALUES (?, ?, ?, ?)',
+				$entry
+			);
+		}
+
+		$value = $config->getUserKeys('userFetch', 'appFetch1');
+		$this->assertEquals(['123', '456'], $value);
+		$this->assertIsString($value[0]);
+		$this->assertIsString($value[1]);
+
+		// cleanup
+		$this->connection->executeUpdate('DELETE FROM `*PREFIX*preferences`');
+	}
+
 	public function testGetUserValueDefault() {
 		$config = $this->getConfig();