Merge pull request #38785 from owncloud/verify-checksum-exceptions

JammingBen · web-flow · commit 701c4a77ff7f · 2021-05-27T11:56:03.000+02:00
Prevent files:checksum:verify from crashing on exception
diff --git a/apps/files/lib/Command/VerifyChecksums.php b/apps/files/lib/Command/VerifyChecksums.php
@@ -29,6 +29,7 @@
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\Files\Storage\IStorage;
+use OCP\Files\StorageNotAvailableException;
 use OCP\IUser;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
@@ -200,11 +201,19 @@ private function verifyChecksumsForFile($file, InputInterface $input, OutputInte
 	private function verifyChecksumsForFolder($folder, InputInterface $input, OutputInterface $output) {
 		$folderQueue = [$folder];
 		while ($currentFolder = \array_pop($folderQueue)) {
+			'@phan-var \OCP\Files\Folder $currentFolder';
+			$currentFolderPath = $currentFolder->getPath();
 			try {
-				'@phan-var \OCP\Files\Folder $currentFolder';
 				$nodes = $currentFolder->getDirectoryListing();
 			} catch (NotFoundException $e) {
 				$nodes = [];
+				$output->writeln("Skipping $currentFolderPath => Directory could not be found");
+			} catch (StorageNotAvailableException $e) {
+				$nodes = [];
+				$output->writeln("Skipping $currentFolderPath => Storage is not available");
+			} catch (\Exception $e) {
+				$nodes = [];
+				$output->writeln("Skipping $currentFolderPath => " . $e->getMessage());
 			}
 			foreach ($nodes as $node) {
 				if ($node->getType() === FileInfo::TYPE_FOLDER) {
diff --git a/changelog/unreleased/38785 b/changelog/unreleased/38785
@@ -0,0 +1,7 @@
+Bugfix: Prevent files:checksum:verify from crashing on exception
+
+The command now skips files with exceptions instead of crashing.
+A proper message will be displayed to the user who fires the command.
+
+https://github.com/owncloud/core/pull/38785
+https://github.com/owncloud/core/issues/38782
