sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16943 from owncloud/sabre-convertinvalidpath 

Convert invalid path exception to sabre exception on MOVE
remotes/origin/poc-doctrine-migrations
Joas Schilling 2015-06-16 10:49:22 +07:00
parent b052eccd9a 1f91e9e65d
commit 60005bea19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/connector/sabre/objecttree.php
Unescape Escape View File

@ -106,7 +106,11 @@ class ObjectTree extends \Sabre\DAV\Tree {
$path = trim($path, '/');
if ($path) {
$this->fileView->verifyPath($path, basename($path));
try {
$this->fileView->verifyPath($path, basename($path));
} catch (\OCP\Files\InvalidPathException $ex) {
throw new InvalidPath($ex->getMessage());
}
}
if (isset($this->cache[$path])) {

2
tests/lib/connector/sabre/objecttree.php
Unescape Escape View File

@ -239,7 +239,7 @@ class ObjectTree extends \Test\TestCase {
}
/**
* @expectedException \OCP\Files\InvalidPathException
* @expectedException \OC\Connector\Sabre\Exception\InvalidPath
*/
public function testGetNodeForPathInvalidPath() {
$path = '/foo\bar';