Skip to content

[stable9] Fix required permissions for webdav move and copy#1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 3 commits into from
Sep 8, 2016
Merged

[stable9] Fix required permissions for webdav move and copy #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
338ce72
Only require CREATE permissions when the file does not exist yet
nickvergessen Sep 7, 2016
a69fe58
UPDATE permissions qualify for renaming a node
nickvergessen Sep 7, 2016
86a673a
Fix tests
nickvergessen Sep 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions apps/dav/lib/connector/sabre/objecttree.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,9 +201,18 @@ public function move($sourcePath, $destinationPath) {
}

$infoDestination = $this->fileView->getFileInfo(dirname($destinationPath));
$infoSource = $this->fileView->getFileInfo($sourcePath);
$destinationPermission = $infoDestination && $infoDestination->isUpdateable();
$sourcePermission = $infoSource && $infoSource->isDeletable();
if (dirname($destinationPath) === dirname($sourcePath)) {
$sourcePermission = $infoDestination && $infoDestination->isUpdateable();
$destinationPermission = $sourcePermission;
} else {
$infoSource = $this->fileView->getFileInfo($sourcePath);
if ($this->fileView->file_exists($destinationPath)) {
$destinationPermission = $infoDestination && $infoDestination->isUpdateable();
} else {
$destinationPermission = $infoDestination && $infoDestination->isCreatable();
}
$sourcePermission = $infoSource && $infoSource->isDeletable();
}

if (!$destinationPermission || !$sourcePermission) {
throw new Forbidden('No permissions to move object.');
Expand DownExpand Up@@ -292,7 +301,12 @@ public function copy($source, $destination) {
}

$info = $this->fileView->getFileInfo(dirname($destination));
if ($info && !$info->isUpdateable()) {
if ($this->fileView->file_exists($destination)) {
$destinationPermission = $info && $info->isUpdateable();
} else {
$destinationPermission = $info && $info->isCreatable();
}
if (!$destinationPermission) {
throw new Forbidden('No permissions to copy object.');
}

Expand Down
48 changes: 31 additions & 17 deletions apps/dav/tests/unit/connector/sabre/objecttree.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,22 +34,23 @@

class TestDoubleFileView extends \OC\Files\View {

public function __construct($updatables, $deletables, $canRename = true) {
public function __construct($creatables, $updatables, $deletables, $canRename = true) {
$this->creatables = $creatables;
$this->updatables = $updatables;
$this->deletables = $deletables;
$this->canRename = $canRename;
}

public function isUpdatable($path) {
return $this->updatables[$path];
return !empty($this->updatables[$path]);
}

public function isCreatable($path) {
return $this->updatables[$path];
return !empty($this->creatables[$path]);
}

public function isDeletable($path) {
return $this->deletables[$path];
return !empty($this->deletables[$path]);
}

public function rename($path1, $path2) {
Expand All@@ -62,7 +63,11 @@ public function getRelativePath($path) {

public function getFileInfo($path, $includeMountPoints = true) {
$objectTreeTest = new ObjectTree();
return $objectTreeTest->getFileInfoMock();
return $objectTreeTest->getFileInfoMock(
$this->isCreatable($path),
$this->isUpdatable($path),
$this->isDeletable($path)
);
}
}

Expand All@@ -75,16 +80,22 @@ public function getFileInfo($path, $includeMountPoints = true) {
*/
class ObjectTree extends \Test\TestCase {

public function getFileInfoMock() {
$mock = $this->getMock('\OCP\Files\FileInfo');
public function getFileInfoMock($create = true, $update = true, $delete = true) {
$mock = $this->getMockBuilder('\OCP\Files\FileInfo')
->disableOriginalConstructor()
->getMock();
$mock
->expects($this->any())
->method('isDeletable')
->willReturn(true);
->method('isCreatable')
->willReturn($create);
$mock
->expects($this->any())
->method('isUpdateable')
->willReturn(true);
->willReturn($update);
$mock
->expects($this->any())
->method('isDeletable')
->willReturn($delete);

return $mock;
}
Expand All@@ -95,14 +106,14 @@ public function getFileInfoMock() {
* @expectedException \Sabre\DAV\Exception\Forbidden
*/
public function testMoveFailed($source, $destination, $updatables, $deletables) {
$this->moveTest($source, $destination, $updatables, $deletables);
$this->moveTest($source, $destination, $updatables, $updatables, $deletables, true);
}

/**
* @dataProvider moveSuccessProvider
*/
public function testMoveSuccess($source, $destination, $updatables, $deletables) {
$this->moveTest($source, $destination, $updatables, $deletables);
$this->moveTest($source, $destination, $updatables, $updatables, $deletables);
$this->assertTrue(true);
}

Expand All@@ -111,7 +122,7 @@ public function testMoveSuccess($source, $destination, $updatables, $deletables)
* @expectedException \OCA\DAV\Connector\Sabre\Exception\InvalidPath
*/
public function testMoveFailedInvalidChars($source, $destination, $updatables, $deletables) {
$this->moveTest($source, $destination, $updatables, $deletables);
$this->moveTest($source, $destination, $updatables, $updatables, $deletables);
}

function moveFailedInvalidCharsProvider() {
Expand DownExpand Up@@ -142,10 +153,13 @@ function moveSuccessProvider() {
/**
* @param $source
* @param $destination
* @param $creatables
* @param $updatables
* @param $deletables
* @param $throwsBeforeGetNode
*/
private function moveTest($source, $destination, $updatables, $deletables) {
$view = new TestDoubleFileView($updatables, $deletables);
private function moveTest($source, $destination, $creatables, $updatables, $deletables, $throwsBeforeGetNode = false) {
$view = new TestDoubleFileView($creatables, $updatables, $deletables);

$info = new FileInfo('', null, null, array(), null);

Expand All@@ -154,7 +168,7 @@ private function moveTest($source, $destination, $updatables, $deletables) {
array('nodeExists', 'getNodeForPath'),
array($rootDir, $view));

$objectTree->expects($this->once())
$objectTree->expects($throwsBeforeGetNode ? $this->never() : $this->once())
->method('getNodeForPath')
->with($this->identicalTo($source))
->will($this->returnValue(false));
Expand DownExpand Up@@ -345,7 +359,7 @@ public function testFailingMove() {
$updatables = array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false);
$deletables = array('a/b' => true);

$view = new TestDoubleFileView($updatables, $deletables);
$view = new TestDoubleFileView($updatables, $updatables, $deletables);

$info = new FileInfo('', null, null, array(), null);

Expand Down