Use getSystemValueString to fetch instanceid

Signed-off-by: J0WI <[email protected]>
nextcloud · Dec 5, 2022 · bd589e8 · bd589e8
1 parent 5305ee2
commit bd589e8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
@@ -374,7 +374,7 @@ private function addPadding($data) {
 	 * @return string
 	 */
 	protected function generatePasswordHash($password, $cipher, $uid = '') {
-		$instanceId = $this->config->getSystemValue('instanceid');
+		$instanceId = $this->config->getSystemValueString('instanceid');
 		$instanceSecret = $this->config->getSystemValueString('secret');
 		$salt = hash('sha256', $uid . $instanceId . $instanceSecret, true);
 		$keySize = $this->getKeySize($cipher);

diff --git a/apps/files/lib/Command/ScanAppData.php b/apps/files/lib/Command/ScanAppData.php
@@ -266,9 +266,9 @@ protected function reconnectToDatabase(OutputInterface $output): Connection {
 	 * @throws NotFoundException
 	 */
 	private function getAppDataFolder() {
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+		$instanceId = $this->config->getSystemValueString('instanceid');
 
-		if ($instanceId === null) {
+		if ($instanceId === '') {
 			throw new NotFoundException();
 		}
 

diff --git a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php
@@ -46,9 +46,9 @@ public function __construct(IConfig $config, LoggerInterface $log, ITimeFactory
 	 */
 	public function run($arguments) {
 		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+		$instanceId = $this->config->getSystemValueString('instanceid');
 
-		if (!is_string($instanceId) || empty($instanceId)) {
+		if ($instanceId === '') {
 			return;
 		}
 

diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
@@ -94,7 +94,7 @@ public function __construct(
 		$this->config = $config;
 
 		$this->excludedPaths[] = 'files_encryption';
-		$this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
+		$this->excludedPaths[] = 'appdata_' . $config->getSystemValueString('instanceid');
 		$this->excludedPaths[] = 'files_external';
 	}
 

diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php
@@ -44,9 +44,9 @@ public function getName() {
 
 	public function run(IOutput $output) {
 		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+		$instanceId = $this->config->getSystemValueString('instanceid');
 
-		if (!is_string($instanceId) || empty($instanceId)) {
+		if ($instanceId === '') {
 			return;
 		}
 

diff --git a/lib/private/Repair/NC25/AddMissingSecretJob.php b/lib/private/Repair/NC25/AddMissingSecretJob.php
@@ -42,8 +42,8 @@ public function getName(): string {
 	}
 
 	public function run(IOutput $output): void {
-		$passwordSalt = $this->config->getSystemValue('passwordsalt', null);
-		if ($passwordSalt === null || $passwordSalt === '') {
+		$passwordSalt = $this->config->getSystemValueString('passwordsalt');
+		if ($passwordSalt === '') {
 			try {
 				$this->config->setSystemValue('passwordsalt', $this->random->generate(30));
 			} catch (HintException $e) {

diff --git a/lib/private/Security/IdentityProof/Manager.php b/lib/private/Security/IdentityProof/Manager.php
@@ -153,8 +153,8 @@ public function getKey(IUser $user): Key {
 	 * @throws \RuntimeException
 	 */
 	public function getSystemKey(): Key {
-		$instanceId = $this->config->getSystemValue('instanceid', null);
-		if ($instanceId === null) {
+		$instanceId = $this->config->getSystemValueString('instanceid');
+		if ($instanceId === '') {
 			throw new \RuntimeException('no instance id!');
 		}
 		return $this->retrieveKey('system-' . $instanceId);

diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
@@ -202,9 +202,9 @@ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
 			}
 		}
 
-		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+		$instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
 
-		if ($instanceId === null) {
+		if ($instanceId === '') {
 			throw new \RuntimeException('no instance id!');
 		}
 		$appdata = 'appdata_' . $instanceId;

diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php
@@ -210,7 +210,7 @@ public function testGetSystemKey() {
 		/** @var Key|\PHPUnit\Framework\MockObject\MockObject $key */
 		$key = $this->createMock(Key::class);
 
-		$this->config->expects($this->once())->method('getSystemValue')
+		$this->config->expects($this->once())->method('getSystemValueString')
 			->with('instanceid', null)->willReturn('instanceId');
 
 		$manager->expects($this->once())->method('retrieveKey')->with('system-instanceId')
@@ -229,7 +229,7 @@ public function testGetSystemKeyFailure() {
 		/** @var Key|\PHPUnit\Framework\MockObject\MockObject $key */
 		$key = $this->createMock(Key::class);
 
-		$this->config->expects($this->once())->method('getSystemValue')
+		$this->config->expects($this->once())->method('getSystemValueString')
 			->with('instanceid', null)->willReturn(null);
 
 		$manager->getSystemKey();