Merge pull request #35600 from nextcloud/fix/empty-secret-migration-f…

…iles-external Fix migration to non-empty secret
nextcloud · Dec 6, 2022 · 28358ac · 28358ac
2 parents decf2b4 + 5e31ed4
commit 28358ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php
@@ -60,7 +60,11 @@ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = n
 		$auth = new RSACrypt();
 		$auth->setPassword($this->config->getSystemValue('secret', ''));
 		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
-			throw new \RuntimeException('unable to load private key');
+			// Add fallback routine for a time where secret was not enforced to be exists
+			$auth->setPassword('');
+			if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+				throw new \RuntimeException('unable to load private key');
+			}
 		}
 		$storage->setBackendOption('public_key_auth', $auth);
 	}

diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php
@@ -58,7 +58,11 @@ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = n
 		$auth = new RSACrypt();
 		$auth->setPassword($this->config->getSystemValue('secret', ''));
 		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
-			throw new \RuntimeException('unable to load private key');
+			// Add fallback routine for a time where secret was not enforced to be exists
+			$auth->setPassword('');
+			if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+				throw new \RuntimeException('unable to load private key');
+			}
 		}
 		$storage->setBackendOption('public_key_auth', $auth);
 	}