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

Merge pull request #5710 from nextcloud/nested-permissions-mask-12 

[12] Fix scan permissions with nested permissions masks
This commit is contained in:
Morris Jobke 2017-07-13 23:42:15 +02:00 committed by GitHub
parent 90972044b1 5804dfc078
commit 9a07f78480
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Storage/Wrapper/PermissionsMask.php
View File

@ -143,7 +143,7 @@ class PermissionsMask extends Wrapper {
$data = parent::getMetaData($path); $data = parent::getMetaData($path);
if ($data && isset($data['permissions'])) { if ($data && isset($data['permissions'])) {
$data['scan_permissions'] = $data['permissions']; $data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
$data['permissions'] &= $this->mask; $data['permissions'] &= $this->mask;
} }
return $data; return $data;

15
tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
View File

@ -127,6 +127,21 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage {
$this->assertEquals(Constants::PERMISSION_READ, $storage->getCache()->get('foo')->getPermissions()); $this->assertEquals(Constants::PERMISSION_READ, $storage->getCache()->get('foo')->getPermissions());
} }
public function testScanNewFilesNested() {
$storage = $this->getMaskedStorage(Constants::PERMISSION_READ + Constants::PERMISSION_CREATE + Constants::PERMISSION_UPDATE);
$nestedStorage = new \OC\Files\Storage\Wrapper\PermissionsMask(array(
'storage' => $storage,
'mask' => Constants::PERMISSION_READ + Constants::PERMISSION_CREATE
));
$wrappedStorage = new Wrapper(['storage' => $nestedStorage]);
$wrappedStorage->file_put_contents('foo', 'bar');
$wrappedStorage->getScanner()->scan('');
$this->assertEquals(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, $this->sourceStorage->getCache()->get('foo')->getPermissions());
$this->assertEquals(Constants::PERMISSION_READ + Constants::PERMISSION_UPDATE, $storage->getCache()->get('foo')->getPermissions());
$this->assertEquals(Constants::PERMISSION_READ, $wrappedStorage->getCache()->get('foo')->getPermissions());
}
public function testScanUnchanged() { public function testScanUnchanged() {
$this->sourceStorage->mkdir('foo'); $this->sourceStorage->mkdir('foo');
$this->sourceStorage->file_put_contents('foo/bar.txt', 'bar'); $this->sourceStorage->file_put_contents('foo/bar.txt', 'bar');