upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge pull request #16886 from owncloud/webdav-verify-path-again

Browse source 
verify path when getting a node for sabredav
This commit is contained in:
Vincent Petry 2015-06-12 16:45:20 +02:00
commit 446f628136
2 changed files with 60 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/connector/sabre/objecttree.php
View file

@ -105,6 +105,10 @@ class ObjectTree extends \Sabre\DAV\Tree {
}
$path = trim($path, '/');
if ($path) {
$this->fileView->verifyPath($path, basename($path));
}
if (isset($this->cache[$path])) {
return $this->cache[$path];
}

62
tests/lib/connector/sabre/objecttree.php
View file

@ -11,6 +11,7 @@ namespace Test\OC\Connector\Sabre;
use OC\Files\FileInfo;
use OC\Connector\Sabre\Directory;
use OC\Files\Storage\Temporary;
class TestDoubleFileView extends \OC\Files\View {
@ -36,7 +37,7 @@ class TestDoubleFileView extends \OC\Files\View {
return $this->canRename;
}
public function getRelativePath($path){
public function getRelativePath($path) {
return $path;
}
}
@ -122,11 +123,11 @@ class ObjectTree extends \Test\TestCase {
* @dataProvider nodeForPathProvider
*/
public function testGetNodeForPath(
$inputFileName,
$fileInfoQueryPath,
$outputFileName,
$type,
$enableChunkingHeader
$inputFileName,
$fileInfoQueryPath,
$outputFileName,
$type,
$enableChunkingHeader
) {
if ($enableChunkingHeader) {
@ -237,4 +238,53 @@ class ObjectTree extends \Test\TestCase {
);
}
/**
* @expectedException \OCP\Files\InvalidPathException
*/
public function testGetNodeForPathInvalidPath() {
$path = '/foo\bar';
$storage = new Temporary([]);
$view = $this->getMock('\OC\Files\View', ['resolvePath']);
$view->expects($this->once())
->method('resolvePath')
->will($this->returnCallback(function($path) use ($storage){
return [$storage, ltrim($path, '/')];
}));
$rootNode = $this->getMockBuilder('\OC\Connector\Sabre\Directory')
->disableOriginalConstructor()
->getMock();
$mountManager = $this->getMock('\OC\Files\Mount\Manager');
$tree = new \OC\Connector\Sabre\ObjectTree();
$tree->init($rootNode, $view, $mountManager);
$tree->getNodeForPath($path);
}
public function testGetNodeForPathRoot() {
$path = '/';
$storage = new Temporary([]);
$view = $this->getMock('\OC\Files\View', ['resolvePath']);
$view->expects($this->any())
->method('resolvePath')
->will($this->returnCallback(function ($path) use ($storage) {
return [$storage, ltrim($path, '/')];
}));
$rootNode = $this->getMockBuilder('\OC\Connector\Sabre\Directory')
->disableOriginalConstructor()
->getMock();
$mountManager = $this->getMock('\OC\Files\Mount\Manager');
$tree = new \OC\Connector\Sabre\ObjectTree();
$tree->init($rootNode, $view, $mountManager);
$tree->getNodeForPath($path);
}
}