Merge pull request #46140 from nextcloud/fix-nc-env-inclusion

fix(config): Add missing handling for `envCache` in `getKeys()`

1 files changed, 13 insertions, 5 deletions

diff --git a/lib/private/Config.php b/lib/private/Config.php
index 6823ab7027f..08f9b028856 100644
--- a/lib/private/Config.php
+++ b/lib/private/Config.php
@@ -49,7 +49,7 @@ class Config {
 	 * @return array an array of key names
 	 */
 	public function getKeys() {
-		return array_keys($this->cache);
+		return array_merge(array_keys($this->cache), array_keys($this->envCache));
 	}
 
 	/**
@@ -64,9 +64,8 @@ class Config {
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envKey = self::ENV_PREFIX . $key;
-		if (isset($this->envCache[$envKey])) {
-			return $this->envCache[$envKey];
+		if (isset($this->envCache[$key])) {
+			return $this->envCache[$key];
 		}
 
 		if (isset($this->cache[$key])) {
@@ -226,7 +225,16 @@ class Config {
 			}
 		}
 
-		$this->envCache = getenv();
+		// grab any "NC_" environment variables
+		$envRaw = getenv();
+		// only save environment variables prefixed with "NC_" in the cache
+		$envPrefixLen = strlen(self::ENV_PREFIX);
+		foreach ($envRaw as $rawEnvKey => $rawEnvValue) {
+			if (str_starts_with($rawEnvKey, self::ENV_PREFIX)) {
+				$realKey = substr($rawEnvKey, $envPrefixLen);
+				$this->envCache[$realKey] = $rawEnvValue;
+			}
+		}
 	}
 
 	/**