Merge pull request #6246 from nextcloud/backport/6243/stable29

[stable29] fix: catch all errors when getting rich workspace content

lib/DAV/WorkspacePlugin.php

@@ -25,6 +25,7 @@
 
 namespace OCA\Text\DAV;
 
+use Exception;
 use OC\Files\Node\File;
 use OC\Files\Node\Folder;
 use OCA\DAV\Connector\Sabre\Directory;
@@ -37,6 +38,7 @@
 use OCP\Files\StorageNotAvailableException;
 use OCP\IConfig;
 use OCP\Lock\LockedException;
+use Psr\Log\LoggerInterface;
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
@@ -55,16 +57,20 @@ class WorkspacePlugin extends ServerPlugin {
 	/**  @var IRootFolder */
 	private $rootFolder;
 
+	/** @var LoggerInterface */
+	private $logger;
+
 	/** @var IConfig */
 	private $config;
 
 	/** @var string|null */
 	private $userId;
 
-	public function __construct(WorkspaceService $workspaceService, IRootFolder $rootFolder, IConfig $config, $userId) {
+	public function __construct(WorkspaceService $workspaceService, IRootFolder $rootFolder, IConfig $config, LoggerInterface $logger, $userId) {
 		$this->workspaceService = $workspaceService;
 		$this->rootFolder = $rootFolder;
 		$this->config = $config;
+		$this->logger = $logger;
 		$this->userId = $userId;
 	}
 
@@ -123,6 +129,10 @@ public function propFind(PropFind $propFind, INode $node) {
 					return $file->getContent();
 				}
 			} catch (GenericFileException|NotPermittedException|LockedException) {
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage(), [
+					'exception' => $e,
+				]);
 			}
 
 			return '';