ILazyConfig

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Nov 26, 2023 · adf08fd · adf08fd
1 parent 371aa1b
commit adf08fd
Show file tree

Hide file tree

Showing 7 changed files with 431 additions and 14 deletions.
diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php
@@ -25,6 +25,7 @@
 use OC\Core\Command\Base;
 use OC\SystemConfig;
 use OCP\IAppConfig;
+use OCP\ILazyConfig;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -37,6 +38,7 @@ class ListConfigs extends Base {
 	public function __construct(
 		protected SystemConfig $systemConfig,
 		protected IAppConfig $appConfig,
+		protected ILazyConfig $lazyConfig,
 	) {
 		parent::__construct();
 	}
@@ -83,17 +85,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$configs = [
 					'system' => $this->getSystemConfigs($noSensitiveValues),
 					'apps' => [],
+					'lazy' => [],
 				];
 				foreach ($apps as $appName) {
 					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
 				}
+				foreach($this->lazyConfig->getApps() as $appId) {
+					$configs['lazy'][$appId] = $this->getLazyConfigs($appId, $noSensitiveValues);
+				}
 				break;
 
 			default:
 				$configs = [
-					'apps' => [
-						$app => $this->getAppConfigs($app, $noSensitiveValues),
-					],
+					'apps' => [$app => $this->getAppConfigs($app, $noSensitiveValues)],
+					'lazy' => [$app => $this->getLazyConfigs($app, $noSensitiveValues)]
 				];
 		}
 
@@ -133,14 +138,22 @@ protected function getSystemConfigs($noSensitiveValues) {
 	 * @param bool $noSensitiveValues
 	 * @return array
 	 */
-	protected function getAppConfigs($app, $noSensitiveValues) {
+	protected function getAppConfigs(string $app, bool $noSensitiveValues): array {
 		if ($noSensitiveValues) {
-			return $this->appConfig->getFilteredValues($app, false);
+			return $this->appConfig->getFilteredValues($app);
 		} else {
 			return $this->appConfig->getValues($app, false);
 		}
 	}
 
+	protected function getLazyConfigs(string $app, bool $noSensitiveValues): array {
+		if ($noSensitiveValues) {
+			return $this->lazyConfig->getFilteredValues($app);
+		} else {
+			return $this->lazyConfig->getValues($app);
+		}
+	}
+
 	/**
 	 * @param string $argumentName
 	 * @param CompletionContext $context

diff --git a/core/register_command.php b/core/register_command.php
@@ -99,7 +99,7 @@
 	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+	$application->add(\OCP\Server::get(\OC\Core\Command\Config\ListConfigs::class));
 	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
 	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
 	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));

diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -36,14 +36,15 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\ILazyConfig;
 use OCP\PreConditionNotMetException;
 
 /**
  * Class to combine all the configuration options ownCloud offers
  */
 class AllConfig implements IConfig {
-	private SystemConfig $systemConfig;
 	private ?IDBConnection $connection = null;
+	private ?ILazyConfig $lazyConfig = null;
 
 	/**
 	 * 3 dimensional array with the following structure:
@@ -67,9 +68,10 @@ class AllConfig implements IConfig {
 	 */
 	private CappedMemoryCache $userCache;
 
-	public function __construct(SystemConfig $systemConfig) {
+	public function __construct(
+		private SystemConfig $systemConfig
+	) {
 		$this->userCache = new CappedMemoryCache();
-		$this->systemConfig = $systemConfig;
 	}
 
 	/**
@@ -546,4 +548,12 @@ public function getUsersForUserValueCaseInsensitive($appName, $key, $value) {
 	public function getSystemConfig() {
 		return $this->systemConfig;
 	}
+
+	public function getLazyConfig(): ILazyConfig {
+		if ($this->lazyConfig === null) {
+			$this->lazyConfig = \OCP\Server::get(ILazyConfig::class);
+		}
+
+		return $this->lazyConfig;
+	}
 }