mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11285 from owncloud/dav-permissions-create 

Fix dav permissions for folders
This commit is contained in:
Thomas Müller 2014-09-26 09:21:32 +02:00
parent 1631937990 10c350b895
commit e5a111b80e
4 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/connector/sabre/node.php
View File

@ -264,7 +264,7 @@ abstract class OC_Connector_Sabre_Node implements \Sabre\DAV\INode, \Sabre\DAV\I
$p .= 'W';
}
} else {
if ($this->info->isUpdateable()) {
if ($this->info->isCreatable()) {
$p .= 'CK';
}
}

9
lib/private/files/fileinfo.php
View File

@ -183,6 +183,15 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
return $this->checkPermissions(\OCP\PERMISSION_UPDATE);
}
/**
* Check whether new files or folders can be created inside this folder
*
* @return bool
*/
public function isCreatable() {
return $this->checkPermissions(\OCP\PERMISSION_CREATE);
}
/**
* @return bool
*/

7
lib/public/files/fileinfo.php
View File

@ -135,6 +135,13 @@ interface FileInfo {
*/
public function isUpdateable();
/**
* Check whether new files or folders can be created inside this folder
*
* @return bool
*/
public function isCreatable();
/**
* Check if a file or folder can be deleted
*

55
tests/lib/connector/sabre/node.php Normal file
View File

@ -0,0 +1,55 @@
<?php
/**
* Copyright (c) 2014 Thomas Müller <thomas.mueller@tmit.eu>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace Test\Connector\Sabre;
use OC\Files\FileInfo;
use OC\Files\View;
class Node extends \PHPUnit_Framework_TestCase {
public function davPermissionsProvider() {
return array(
array(\OCP\PERMISSION_ALL, 'file', false, false, 'RDNVW'),
array(\OCP\PERMISSION_ALL, 'dir', false, false, 'RDNVCK'),
array(\OCP\PERMISSION_ALL, 'file', true, false, 'SRDNVW'),
array(\OCP\PERMISSION_ALL, 'file', true, true, 'SRMDNVW'),
array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_SHARE, 'file', true, false, 'SDNVW'),
array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_UPDATE, 'file', false, false, 'RDNV'),
array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_DELETE, 'file', false, false, 'RW'),
array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_CREATE, 'file', false, false, 'RDNVW'),
array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_CREATE, 'dir', false, false, 'RDNV'),
);
}
/**
* @dataProvider davPermissionsProvider
*/
public function testDavPermissions($permissions, $type, $shared, $mounted, $expected) {
$info = $this->getMockBuilder('\OC\Files\FileInfo')
->disableOriginalConstructor()
->setMethods(array('getPermissions', 'isShared', 'isMounted', 'getType'))
->getMock();
$info->expects($this->any())
->method('getPermissions')
->will($this->returnValue($permissions));
$info->expects($this->any())
->method('isShared')
->will($this->returnValue($shared));
$info->expects($this->any())
->method('isMounted')
->will($this->returnValue($mounted));
$info->expects($this->any())
->method('getType')
->will($this->returnValue($type));
$view = $this->getMock('\OC\Files\View');
$node = new \OC_Connector_Sabre_File($view, $info);
$this->assertEquals($expected, $node->getDavPermissions());
}
}