fix(encryption): Resolve IAppConfig lazily to prevent early IDBConnection creation

Injecting IAppConfig as a constructor parameter into Encryption\Manager (and
through it into EncryptionWrapper) caused IDBConnection to be eagerly resolved
during OC::init() on PHP <8.4 (no lazy ghost objects). This happened before
maintenance:install's Sqlite::initialize() wrote dbname to config.php, so the
connection latched onto the default database name ('owncloud') instead of the
configured one ('nextcloud'). All migrations then ran against owncloud.db, and
the subsequent enable_all.php process opened an empty nextcloud.db — crashing
with "no such table: oc_appconfig".

Remove IAppConfig from Manager's constructor and Server.php's factory closure.
Resolve it lazily via Server::get(IAppConfig::class) inside
EncryptionWrapper::wrapStorage(), which is only called after the filesystem is
set up, never during bootstrap.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Author: cuppett

lib/private/Encryption/EncryptionWrapper.php

@@ -39,7 +39,6 @@ class EncryptionWrapper {
 	public function __construct(
 		private ArrayCache $arrayCache,
 		private Manager $manager,
-		private IAppConfig $appConfig,
 		private LoggerInterface $logger,
 	) {
 	}
@@ -73,8 +72,8 @@ public function wrapStorage(string $mountPoint, IStorage $storage, IMountPoint $
 			}
 
 			// Skip encryption for home mounts if encryptHomeStorage is disabled
-			if ($mount instanceof HomeMountPoint &&
-				!$this->appConfig->getValueBool('encryption', 'encryptHomeStorage', true)) {
+			if ($mount instanceof HomeMountPoint
+				&& !Server::get(IAppConfig::class)->getValueBool('encryption', 'encryptHomeStorage', true)) {
 				return $storage;
 			}
 		}

lib/private/Encryption/Manager.php

@@ -18,7 +18,6 @@
 use OCP\Encryption\IManager;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IStorage;
-use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IL10N;
 use Psr\Log\LoggerInterface;
@@ -33,7 +32,6 @@ public function __construct(
 		protected View $rootView,
 		protected Util $util,
 		protected ArrayCache $arrayCache,
-		protected IAppConfig $appConfig,
 	) {
 		$this->encryptionModules = [];
 	}
@@ -207,13 +205,13 @@ public function getDefaultEncryptionModuleId() {
 	public function setupStorage() {
 		// If encryption is disabled and there are no loaded modules it makes no sense to load the wrapper
 		if (!empty($this->encryptionModules) || $this->isEnabled()) {
-			$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->appConfig, $this->logger);
+			$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
 			Filesystem::addStorageWrapper('oc_encryption', [$encryptionWrapper, 'wrapStorage'], 2);
 		}
 	}
 
 	public function forceWrapStorage(IMountPoint $mountPoint, IStorage $storage) {
-		$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->appConfig, $this->logger);
+		$encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
 		return $encryptionWrapper->wrapStorage($mountPoint->getMountPoint(), $storage, $mountPoint, true);
 	}
 

lib/private/Server.php

@@ -384,8 +384,7 @@ public function __construct(
 				$c->getL10N('core'),
 				new View(),
 				$util,
-				new ArrayCache(),
-				$c->get(IAppConfig::class),
+				new ArrayCache()
 			);
 		});
 		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);

tests/lib/Encryption/EncryptionWrapperTest.php

@@ -15,7 +15,6 @@
 use OCA\Files_Trashbin\Storage;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IDisableEncryptionStorage;
-use OCP\IAppConfig;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
@@ -32,19 +31,15 @@ class EncryptionWrapperTest extends TestCase {
 	/** @var \PHPUnit\Framework\MockObject\MockObject|ArrayCache */
 	private $arrayCache;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject|IAppConfig */
-	private $appConfig;
-
 	#[\Override]
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->arrayCache = $this->createMock(ArrayCache::class);
 		$this->manager = $this->createMock(Manager::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
 
-		$this->instance = new EncryptionWrapper($this->arrayCache, $this->manager, $this->appConfig, $this->logger);
+		$this->instance = new EncryptionWrapper($this->arrayCache, $this->manager, $this->logger);
 	}