Skip to content

[stable14] Get permission of storage for shares #11287

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

Merged
nickvergessen merged 4 commits into from
Sep 20, 2018
Merged

[stable14] Get permission of storage for shares #11287

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cc8cdc
Check the permission of the underlying storage
rullzer Sep 3, 2018
43f73ad
Fix shared cache
rullzer Sep 5, 2018
b66b2de
Properly check share permissions
rullzer Sep 6, 2018
5e13368
Update test now that we check permissions properly
rullzer Sep 6, 2018
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
Next Next commit
Check the permission of the underlying storage 
Else shares might expose more permissions than the storage actually
providers.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer @nickvergessen
rullzer authored and nickvergessen committed Sep 19, 2018
commit 4cc8cdc276e07a3449f55d9ba7264a44b58961ea
3 changes: 2 additions & 1 deletion apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ public function getPermissions($target = '') {
if (!$this->isValid()) {
return 0;
}
$permissions = $this->superShare->getPermissions();
$permissions = parent::getPermissions($target) & $this->superShare->getPermissions();

// part files and the mount point always have delete permissions
if ($target === '' || pathinfo($target, PATHINFO_EXTENSION) === 'part') {
$permissions |= \OCP\Constants::PERMISSION_DELETE;
Expand Down