From 8923c37f57de1639d4967ab339781593f60ab667 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 24 Apr 2024 07:18:47 +0200 Subject: [PATCH] fix(DAV): Migrate known exceptions to Sabre exceptions when copying Signed-off-by: Joas Schilling --- apps/dav/lib/Connector/Sabre/Directory.php | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index 49354deb778..579c9fe5169 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -467,20 +467,28 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol public function copyInto($targetName, $sourcePath, INode $sourceNode) { if ($sourceNode instanceof File || $sourceNode instanceof Directory) { - $destinationPath = $this->getPath() . '/' . $targetName; - $sourcePath = $sourceNode->getPath(); + try { + $destinationPath = $this->getPath() . '/' . $targetName; + $sourcePath = $sourceNode->getPath(); - if (!$this->fileView->isCreatable($this->getPath())) { - throw new \Sabre\DAV\Exception\Forbidden(); - } + if (!$this->fileView->isCreatable($this->getPath())) { + throw new \Sabre\DAV\Exception\Forbidden(); + } - try { - $this->fileView->verifyPath($this->getPath(), $targetName); - } catch (InvalidPathException $ex) { - throw new InvalidPath($ex->getMessage()); - } + try { + $this->fileView->verifyPath($this->getPath(), $targetName); + } catch (InvalidPathException $ex) { + throw new InvalidPath($ex->getMessage()); + } - return $this->fileView->copy($sourcePath, $destinationPath); + return $this->fileView->copy($sourcePath, $destinationPath); + } catch (StorageNotAvailableException $e) { + throw new ServiceUnavailable($e->getMessage()); + } catch (ForbiddenException $ex) { + throw new Forbidden($ex->getMessage(), $ex->getRetry()); + } catch (LockedException $e) { + throw new FileLocked($e->getMessage(), $e->getCode(), $e); + } } return false;