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

Merge pull request #2486 from nextcloud/shared-storage-mask 

apply permissions mask for shared storage
This commit is contained in:
Lukas Reschke 2016-12-02 23:39:48 +01:00 committed by GitHub
parent 5a3a776af9 1a379b0fdc
commit 1131338562
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/files_sharing/lib/SharedStorage.php
View File

@ -33,6 +33,8 @@ namespace OCA\Files_Sharing;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OC\Files\Cache\FailedCache; use OC\Files\Cache\FailedCache;
use OC\Files\Storage\Wrapper\PermissionsMask;
use OCA\Files_Sharing\ISharedStorage;
use OC\Files\Storage\FailedStorage; use OC\Files\Storage\FailedStorage;
use OCP\Constants; use OCP\Constants;
use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICacheEntry;
@ -71,6 +73,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
*/ */
private $logger; private $logger;
/** @var IStorage */
private $nonMaskedStorage;
private $options; private $options;
public function __construct($arguments) { public function __construct($arguments) {
@ -94,7 +99,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
private function getSourceRootInfo() { private function getSourceRootInfo() {
if (is_null($this->sourceRootInfo)) { if (is_null($this->sourceRootInfo)) {
if (is_null($this->superShare->getNodeCacheEntry())) { if (is_null($this->superShare->getNodeCacheEntry())) {
$this->sourceRootInfo = $this->getWrapperStorage()->getCache()->get($this->rootPath); $this->sourceRootInfo = $this->nonMaskedStorage->getCache()->get($this->rootPath);
} else { } else {
$this->sourceRootInfo = $this->superShare->getNodeCacheEntry(); $this->sourceRootInfo = $this->superShare->getNodeCacheEntry();
} }
@ -110,7 +115,11 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
try { try {
Filesystem::initMountPoints($this->superShare->getShareOwner()); Filesystem::initMountPoints($this->superShare->getShareOwner());
$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId()); $sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
list($this->storage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath); list($this->nonMaskedStorage, $this->rootPath) = $this->ownerView->resolvePath($sourcePath);
$this->storage = new PermissionsMask([
'storage' => $this->nonMaskedStorage,
'mask' => $this->superShare->getPermissions()
]);
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
$this->storage = new FailedStorage(['exception' => $e]); $this->storage = new FailedStorage(['exception' => $e]);
$this->rootPath = ''; $this->rootPath = '';
@ -252,7 +261,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
'mode' => $mode, 'mode' => $mode,
); );
\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info); \OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info);
return parent::fopen($path, $mode); return $this->nonMaskedStorage->fopen($this->getSourcePath($path), $mode);
} }
return false; return false;
} }
@ -265,6 +274,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
* @return bool * @return bool
*/ */
public function rename($path1, $path2) { public function rename($path1, $path2) {
$this->init();
$isPartFile = pathinfo($path1, PATHINFO_EXTENSION) === 'part'; $isPartFile = pathinfo($path1, PATHINFO_EXTENSION) === 'part';
$targetExists = $this->file_exists($path2); $targetExists = $this->file_exists($path2);
$sameFodler = dirname($path1) === dirname($path2); $sameFodler = dirname($path1) === dirname($path2);
@ -279,7 +289,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
} }
} }
return parent::rename($path1, $path2); return $this->nonMaskedStorage->rename($this->getSourcePath($path1), $this->getSourcePath($path2));
} }
/** /**

4
apps/files_sharing/tests/SharedStorageTest.php
View File

@ -202,13 +202,13 @@ class SharedStorageTest extends TestCase {
$this->assertTrue(\OC\Files\Filesystem::is_dir($this->folder)); $this->assertTrue(\OC\Files\Filesystem::is_dir($this->folder));
// for the share root we expect: // for the share root we expect:
// the shared permissions (1) // the read permissions (1)
// the delete permission (8), to enable unshare // the delete permission (8), to enable unshare
$rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder); $rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder);
$this->assertSame(9, $rootInfo->getPermissions()); $this->assertSame(9, $rootInfo->getPermissions());
// for the file within the shared folder we expect: // for the file within the shared folder we expect:
// the shared permissions (1) // the read permissions (1)
$subfileInfo = \OC\Files\Filesystem::getFileInfo($this->folder . $this->filename); $subfileInfo = \OC\Files\Filesystem::getFileInfo($this->folder . $this->filename);
$this->assertSame(1, $subfileInfo->getPermissions()); $this->assertSame(1, $subfileInfo->getPermissions());

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

@ -112,7 +112,7 @@ class PermissionsMask extends Wrapper {
public function file_put_contents($path, $data) { public function file_put_contents($path, $data) {
$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE; $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
return $this->checkMask($permissions) and parent::file_put_contents($path, $data); return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
} }
public function fopen($path, $mode) { public function fopen($path, $mode) {

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

@ -77,7 +77,7 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage {
public function testPutContentsNewFileNoUpdate() { public function testPutContentsNewFileNoUpdate() {
$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE); $storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
$this->assertTrue($storage->file_put_contents('foo', 'bar')); $this->assertEquals(3, $storage->file_put_contents('foo', 'bar'));
$this->assertEquals('bar', $storage->file_get_contents('foo')); $this->assertEquals('bar', $storage->file_get_contents('foo'));
} }