diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-16 10:49:22 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-16 10:49:22 +0200 |
| commit | 60005bea1945537316115217db60397a1691ee86 (patch) | |
| tree | cf0fa9f5d65ad57d459556996c46e37c6cd98b1c | |
| parent | b052eccd9a17089b7aaf4e67286fe254ef507206 (diff) | |
| parent | 1f91e9e65da2a3f029f403ac5f1b7114235383a8 (diff) | |
| download | nextcloud-server-60005bea1945537316115217db60397a1691ee86.tar.gz nextcloud-server-60005bea1945537316115217db60397a1691ee86.zip | |
Merge pull request #16943 from owncloud/sabre-convertinvalidpath
Convert invalid path exception to sabre exception on MOVE
| -rw-r--r-- | lib/private/connector/sabre/objecttree.php | 6 | ||||
| -rw-r--r-- | tests/lib/connector/sabre/objecttree.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index a73c9a860b0..c96a745fcd4 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -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])) { diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index b9f8591b10a..00aab94e012 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -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'; |