wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11215 from owncloud/dav-throwwhendeletefailed

Browse source 
WebDAV now throws 403 when deletion did not work
This commit is contained in:
Morris Jobke 2014-09-23 00:49:30 +02:00
commit f970c81b1e
4 changed files with 131 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/connector/sabre/directory.php
View file

@ -192,7 +192,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
throw new \Sabre\DAV\Exception\Forbidden();
}
$this->fileView->rmdir($this->path);
if (!$this->fileView->rmdir($this->path)) {
// assume it wasn't possible to remove due to permission issue
throw new \Sabre\DAV\Exception\Forbidden();
}
}

6
lib/private/connector/sabre/file.php
View file

@ -167,7 +167,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
if (!$this->info->isDeletable()) {
throw new \Sabre\DAV\Exception\Forbidden();
}
$this->fileView->unlink($this->path);
if (!$this->fileView->unlink($this->path)) {
// assume it wasn't possible to delete due to permissions
throw new \Sabre\DAV\Exception\Forbidden();
}
// remove properties
$this->removeProperties();

64
tests/lib/connector/sabre/directory.php
View file

@ -8,18 +8,24 @@
*/
class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase {
private $view;
private $info;
public function setUp() {
$this->view = $this->getMock('OC\Files\View', array(), array(), '', false);
$this->info = $this->getMock('OC\Files\FileInfo', array(), array(), '', false);
}
private function getRootDir() {
$view = $this->getMock('OC\Files\View', array(), array(), '', false);
$view->expects($this->once())
$this->view->expects($this->once())
->method('getRelativePath')
->will($this->returnValue(''));
$info = $this->getMock('OC\Files\FileInfo', array(), array(), '', false);
$info->expects($this->once())
$this->info->expects($this->once())
->method('getPath')
->will($this->returnValue(''));
return new OC_Connector_Sabre_Directory($view, $info);
return new OC_Connector_Sabre_Directory($this->view, $this->info);
}
/**
@ -45,4 +51,52 @@ class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase {
$dir = $this->getRootDir();
$dir->delete();
}
/**
*
*/
public function testDeleteFolderWhenAllowed() {
// deletion allowed
$this->info->expects($this->once())
->method('isDeletable')
->will($this->returnValue(true));
// but fails
$this->view->expects($this->once())
->method('rmdir')
->will($this->returnValue(true));
$dir = $this->getRootDir();
$dir->delete();
}
/**
* @expectedException \Sabre\DAV\Exception\Forbidden
*/
public function testDeleteFolderFailsWhenNotAllowed() {
$this->info->expects($this->once())
->method('isDeletable')
->will($this->returnValue(false));
$dir = $this->getRootDir();
$dir->delete();
}
/**
* @expectedException \Sabre\DAV\Exception\Forbidden
*/
public function testDeleteFolderThrowsWhenDeletionFailed() {
// deletion allowed
$this->info->expects($this->once())
->method('isDeletable')
->will($this->returnValue(true));
// but fails
$this->view->expects($this->once())
->method('rmdir')
->will($this->returnValue(false));
$dir = $this->getRootDir();
$dir->delete();
}
}

63
tests/lib/connector/sabre/file.php
View file

@ -143,4 +143,67 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
// action
$file->put('test data');
}
/**
*
*/
public function testDeleteWhenAllowed() {
// setup
$view = $this->getMock('\OC\Files\View',
array());
$view->expects($this->once())
->method('unlink')
->will($this->returnValue(true));
$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
'permissions' => \OCP\PERMISSION_ALL
));
$file = new OC_Connector_Sabre_File($view, $info);
// action
$file->delete();
}
/**
* @expectedException \Sabre\DAV\Exception\Forbidden
*/
public function testDeleteThrowsWhenDeletionNotAllowed() {
// setup
$view = $this->getMock('\OC\Files\View',
array());
$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
'permissions' => 0
));
$file = new OC_Connector_Sabre_File($view, $info);
// action
$file->delete();
}
/**
* @expectedException \Sabre\DAV\Exception\Forbidden
*/
public function testDeleteThrowsWhenDeletionFailed() {
// setup
$view = $this->getMock('\OC\Files\View',
array());
// but fails
$view->expects($this->once())
->method('unlink')
->will($this->returnValue(false));
$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
'permissions' => \OCP\PERMISSION_ALL
));
$file = new OC_Connector_Sabre_File($view, $info);
// action
$file->delete();
}
}