Convert invalid path exception to sabre exception on MOVE

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';