Merge pull request #45001 from nextcloud/bugfix/noid/convert-exceptions-to-sabre-exceptions

fix(DAV): Migrate known exceptions to Sabre exceptions when copying
pull/45020/head
Julius Härtl 3 weeks ago committed by GitHub
commit 153705d17c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -469,20 +469,28 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol
public function copyInto($targetName, $sourcePath, INode $sourceNode) { public function copyInto($targetName, $sourcePath, INode $sourceNode) {
if ($sourceNode instanceof File || $sourceNode instanceof Directory) { if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
$destinationPath = $this->getPath() . '/' . $targetName; try {
$sourcePath = $sourceNode->getPath(); $destinationPath = $this->getPath() . '/' . $targetName;
$sourcePath = $sourceNode->getPath();
if (!$this->fileView->isCreatable($this->getPath())) { if (!$this->fileView->isCreatable($this->getPath())) {
throw new \Sabre\DAV\Exception\Forbidden(); throw new \Sabre\DAV\Exception\Forbidden();
} }
try { try {
$this->fileView->verifyPath($this->getPath(), $targetName); $this->fileView->verifyPath($this->getPath(), $targetName);
} catch (InvalidPathException $ex) { } catch (InvalidPathException $ex) {
throw new InvalidPath($ex->getMessage()); 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; return false;

Loading…
Cancel
Save