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

use unmasked permissions in shared scanner

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-12-14 14:35:45 +01:00
parent 4456fa57e0
commit 5d0897b8d7
No known key found for this signature in database
GPG key ID: 425003AC385454C5
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_sharing/lib/Scanner.php
View file

@ -31,6 +31,11 @@ use OC\Files\ObjectStore\NoopScanner;
* Scanner for SharedStorage * Scanner for SharedStorage
*/ */
class Scanner extends \OC\Files\Cache\Scanner { class Scanner extends \OC\Files\Cache\Scanner {
/**
* @var \OCA\Files_Sharing\SharedStorage $storage
*/
protected $storage;
private $sourceScanner; private $sourceScanner;
/** /**
@ -46,8 +51,8 @@ class Scanner extends \OC\Files\Cache\Scanner {
if ($data === null) { if ($data === null) {
return null; return null;
} }
list($sourceStorage, $internalPath) = $this->storage->resolvePath($path); $internalPath = $this->storage->getSourcePath($path);
$data['permissions'] = $sourceStorage->getPermissions($internalPath); $data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
return $data; return $data;
} }

3
apps/files_sharing/lib/SharedStorage.php
View file

@ -446,7 +446,8 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
} }
public function getSourceStorage() { public function getSourceStorage() {
return $this->getWrapperStorage(); $this->init();
return $this->nonMaskedStorage;
} }
public function getWrapperStorage() { public function getWrapperStorage() {

28
apps/files_sharing/tests/SharedStorageTest.php
View file

@ -531,4 +531,32 @@ class SharedStorageTest extends TestCase {
$this->shareManager->deleteShare($share1); $this->shareManager->deleteShare($share1);
$this->shareManager->deleteShare($share2); $this->shareManager->deleteShare($share2);
} }
public function testOwnerPermissions() {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$share = $this->share(
\OCP\Share::SHARE_TYPE_USER,
$this->folder,
self::TEST_FILES_SHARING_API_USER1,
self::TEST_FILES_SHARING_API_USER2,
\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE
);
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
$view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
$this->assertTrue($view->file_exists($this->folder));
$view->file_put_contents($this->folder . '/newfile.txt', 'asd');
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->assertTrue($this->view->file_exists($this->folder . '/newfile.txt'));
$this->assertEquals(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
$this->view->getFileInfo($this->folder . '/newfile.txt')->getPermissions());
$this->view->unlink($this->folder);
$this->shareManager->deleteShare($share);
}
} }