Merge pull request #47394 from nextcloud/backport/46991/stable29

[stable29] fix(ProvisioningAPI): set typed config values by via API
nextcloud · Aug 21, 2024 · 2793de4 · 2793de4
2 parents 132137d + 5d8f5d0
commit 2793de4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/apps/provisioning_api/lib/Controller/AppConfigController.php b/apps/provisioning_api/lib/Controller/AppConfigController.php
@@ -143,8 +143,17 @@ public function setValue(string $app, string $key, string $value): DataResponse
 			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
 		}
 
+		$configDetails = $this->appConfig->getDetails($app, $key);
 		/** @psalm-suppress InternalMethod */
-		$this->appConfig->setValueMixed($app, $key, $value);
+		match ($configDetails['type']) {
+			IAppConfig::VALUE_BOOL => $this->appConfig->setValueBool($app, $key, (bool)$value),
+			IAppConfig::VALUE_FLOAT => $this->appConfig->setValueFloat($app, $key, (float)$value),
+			IAppConfig::VALUE_INT => $this->appConfig->setValueInt($app, $key, (int)$value),
+			IAppConfig::VALUE_STRING => $this->appConfig->setValueString($app, $key, $value),
+			IAppConfig::VALUE_ARRAY => $this->appConfig->setValueArray($app, $key, \json_decode($value, true)),
+			default => $this->appConfig->setValueMixed($app, $key, $value),
+		};
+
 		return new DataResponse();
 	}
 

diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
@@ -37,6 +37,8 @@
 use OCP\IUserSession;
 use OCP\Settings\IManager;
 use Test\TestCase;
+use function json_decode;
+use function json_encode;
 
 /**
  * Class AppConfigControllerTest
@@ -204,6 +206,12 @@ public function dataSetValue() {
 			['app1', 'key', 'default', new \InvalidArgumentException('error1'), null, Http::STATUS_FORBIDDEN],
 			['app2', 'key', 'default', null, new \InvalidArgumentException('error2'), Http::STATUS_FORBIDDEN],
 			['app2', 'key', 'default', null, null, Http::STATUS_OK],
+			['app2', 'key', '1', null, null, Http::STATUS_OK, IAppConfig::VALUE_BOOL],
+			['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_INT],
+			['app2', 'key', '4.2', null, null, Http::STATUS_OK, IAppConfig::VALUE_FLOAT],
+			['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING],
+			['app2', 'key', 'secret', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING | IAppConfig::VALUE_SENSITIVE],
+			['app2', 'key', json_encode([4, 2]), null, null, Http::STATUS_OK, IAppConfig::VALUE_ARRAY],
 		];
 	}
 
@@ -216,7 +224,7 @@ public function dataSetValue() {
 	 * @param \Exception|null $keyThrows
 	 * @param int $status
 	 */
-	public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status) {
+	public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status, int $type = IAppConfig::VALUE_MIXED) {
 		$adminUser = $this->createMock(IUser::class);
 		$adminUser->expects($this->once())
 			->method('getUid')
@@ -260,8 +268,30 @@ public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status
 				->with($app, $key);
 
 			$this->appConfig->expects($this->once())
-				->method('setValueMixed')
-				->with($app, $key, $value);
+				->method('getDetails')
+				->with($app, $key)
+				->willReturn([
+					'app' => $app,
+					'key' => $key,
+					'value' => '', // 🤷
+					'type' => $type,
+					'lazy' => false,
+					'typeString' => (string)$type, // this is not accurate, but acceptable
+					'sensitive' => ($type & IAppConfig::VALUE_SENSITIVE) !== 0,
+				]);
+
+			$configValueSetter = match ($type) {
+				IAppConfig::VALUE_BOOL => 'setValueBool',
+				IAppConfig::VALUE_FLOAT => 'setValueFloat',
+				IAppConfig::VALUE_INT => 'setValueInt',
+				IAppConfig::VALUE_STRING => 'setValueString',
+				IAppConfig::VALUE_ARRAY => 'setValueArray',
+				default => 'setValueMixed',
+			};
+
+			$this->appConfig->expects($this->once())
+				->method($configValueSetter)
+				->with($app, $key, $configValueSetter === 'setValueArray' ? json_decode($value, true) : $value);
 		}
 
 		$result = $api->setValue($app, $key, $value);