fix(encryption): handle legacy string-typed appconfig on upgrade boot

Manager::isEnabled() and EncryptionWrapper::wrap() are both called during
OC::init() bootstrap, before occ upgrade has had a chance to run the
RetypeEncryptionConfigKeys repair step. If encryption_enabled or
encryptHomeStorage were previously stored as VALUE_STRING, the new
getValueBool() calls throw AppConfigTypeConflictException and prevent the
server from booting at all - making occ upgrade unrunnable.

Add a catch(AppConfigTypeConflictException) fallback to both callers that
reads the raw string value and interprets it the legacy way ('yes'/'1' →
true). This fallback only fires in the upgrade window between extracting
new code and running occ upgrade; once the repair step has re-typed the
rows it is never reached again.

Also strengthen RetypeEncryptionConfigKeysTest setUp() to delete both
keys before each test, so real-DB residue from occ invocations in the
same process cannot pollute the absence-check test.

Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Author: cuppett

lib/private/Encryption/EncryptionWrapper.php

@@ -14,6 +14,7 @@
 use OC\Memcache\ArrayCache;
 use OCP\Encryption\IFile;
 use OCP\Encryption\Keys\IStorage as EncryptionKeysStorage;
+use OCP\Exceptions\AppConfigTypeConflictException;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IDisableEncryptionStorage;
 use OCP\Files\Storage\IStorage;
@@ -72,8 +73,7 @@ public function wrapStorage(string $mountPoint, IStorage $storage, IMountPoint $
 			}
 
 			// Skip encryption for home mounts if encryptHomeStorage is disabled
-			if ($mount instanceof HomeMountPoint
-				&& !Server::get(IAppConfig::class)->getValueBool('encryption', 'encryptHomeStorage', true)) {
+			if ($mount instanceof HomeMountPoint && !$this->shouldEncryptHomeStorage()) {
 				return $storage;
 			}
 		}
@@ -103,4 +103,18 @@ public function wrapStorage(string $mountPoint, IStorage $storage, IMountPoint $
 			$this->arrayCache
 		);
 	}
+
+	private function shouldEncryptHomeStorage(): bool {
+		$appConfig = Server::get(IAppConfig::class);
+		try {
+			return $appConfig->getValueBool('encryption', 'encryptHomeStorage', true);
+		} catch (AppConfigTypeConflictException) {
+			// Stored as VALUE_STRING from a pre-upgrade installation.
+			// RetypeEncryptionConfigKeys repair step will fix the type on occ upgrade.
+			return $appConfig->getValueString('encryption', 'encryptHomeStorage', '1') === '1';
+		} catch (\Throwable) {
+			// DB not ready (e.g. oc_appconfig does not yet exist during install).
+			return true;
+		}
+	}
 }

lib/private/Encryption/Manager.php

@@ -16,6 +16,7 @@
 use OC\ServiceUnavailableException;
 use OCP\Encryption\IEncryptionModule;
 use OCP\Encryption\IManager;
+use OCP\Exceptions\AppConfigTypeConflictException;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IStorage;
 use OCP\IAppConfig;
@@ -49,7 +50,16 @@ public function isEnabled() {
 			return false;
 		}
 
-		return $this->appConfig->getValueBool('core', 'encryption_enabled', false);
+		try {
+			return $this->appConfig->getValueBool('core', 'encryption_enabled', false);
+		} catch (AppConfigTypeConflictException) {
+			// Stored as VALUE_STRING from a pre-upgrade installation.
+			// RetypeEncryptionConfigKeys repair step will fix the type on occ upgrade.
+			return $this->appConfig->getValueString('core', 'encryption_enabled', 'no') === 'yes';
+		} catch (\Throwable) {
+			// DB not ready (e.g. oc_appconfig does not yet exist during install).
+			return false;
+		}
 	}
 
 	/**

tests/lib/Repair/RetypeEncryptionConfigKeysTest.php

@@ -29,6 +29,9 @@ protected function setUp(): void {
 		$this->appConfig = Server::get(IAppConfig::class);
 		$this->output = $this->createMock(IOutput::class);
 		$this->repair = new RetypeEncryptionConfigKeys($this->appConfig);
+		// Clean slate in case previous test runs or occ invocations left residue
+		$this->appConfig->deleteKey('core', 'encryption_enabled');
+		$this->appConfig->deleteKey('encryption', 'encryptHomeStorage');
 	}
 
 	protected function tearDown(): void {