Skip to content

fix(files_sharing): preserve unmasked permissions as scan_permissions #61905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −0
Open

fix(files_sharing): preserve unmasked permissions as scan_permissions #61905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/files_sharing/lib/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ protected function formatCacheEntry($entry, $path = null) {

try {
if (isset($entry['permissions'])) {
// keep the unmasked permissions so a future scan or cross-storage
// copy doesn't persist the share-masked permissions in the cache
$entry['scan_permissions'] ??= $entry['permissions'];
$entry['permissions'] &= $this->share->getPermissions();
} else {
$entry['permissions'] = $this->storage->getPermissions($entry['path']);
Expand Down
49 changes: 49 additions & 0 deletions apps/files_sharing/tests/CacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,55 @@ public function testSearchShareJailedStorage(): void {
$this->assertCount(1, $results);
}

public function testSingleFileShareKeepsUnmaskedPermissionsAsScanPermissions(): void {
$sourceEntry = $this->ownerCache->get('files/container/shared single file.txt');

/** @var SharedStorage $sharedStorage */
[$sharedStorage] = $this->user2View->resolvePath('shared single file.txt');
$entry = $sharedStorage->getCache()->get('');

$mask = Constants::PERMISSION_ALL & ~(Constants::PERMISSION_CREATE | Constants::PERMISSION_DELETE);
$this->assertEquals($sourceEntry->getPermissions() & $mask, $entry->getPermissions());
$this->assertEquals($sourceEntry->getPermissions(), $entry['scan_permissions']);
}

public function testFolderShareKeepsUnmaskedPermissionsAsScanPermissions(): void {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);

$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
$node = $rootFolder->get('container');
$share = $this->shareManager->newShare();
$share->setNode($node)
->setShareType(IShare::TYPE_USER)
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_SHARE);
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
Server::get(ISetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);

/** @var SharedStorage $sharedStorage */
[$sharedStorage] = $this->user2View->resolvePath('container');
$sharedCache = $sharedStorage->getCache();
$mask = Constants::PERMISSION_READ | Constants::PERMISSION_SHARE;

$entry = $sharedCache->get('shareddir/bar.txt');
$sourceEntry = $this->ownerCache->get('files/container/shareddir/bar.txt');
$this->assertEquals($sourceEntry->getPermissions() & $mask, $entry->getPermissions());
$this->assertEquals($sourceEntry->getPermissions(), $entry['scan_permissions']);

$children = $sharedCache->getFolderContents('shareddir');
$this->assertNotEmpty($children);
foreach ($children as $child) {
$sourceChild = $this->ownerCache->get('files/container/shareddir/' . $child->getName());
$this->assertEquals($sourceChild->getPermissions() & $mask, $child->getPermissions());
$this->assertEquals($sourceChild->getPermissions(), $child['scan_permissions']);
}
}

public function testWatcherRootChange(): void {
$sourceStorage = new Temporary();
$sourceStorage->mkdir('shared');
Expand Down
Loading