Skip to content

fix(dav): mask public-share permissions by storage type #61014

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
brueckner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(dav): mask public-share permissions by storage type #61014

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
23 changes: 18 additions & 5 deletions apps/dav/appinfo/v2/publicremote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\DirPermissionsMask;
use OC\Files\Storage\Wrapper\PermissionsMask;
use OC\Files\View;
use OCA\DAV\Connector\Sabre\PublicAuth;
use OCA\DAV\Connector\Sabre\ServerFactory;
Expand All @@ -21,6 +22,7 @@
use OCP\BeforeSabrePubliclyLoadedEvent;
use OCP\Constants;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IHomeStorage;
use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountManager;
use OCP\ICacheFactory;
Expand Down Expand Up @@ -115,11 +117,22 @@
$mask |= Constants::PERMISSION_READ | Constants::PERMISSION_DELETE;
}

return new DirPermissionsMask([
'storage' => $storage,
'mask' => $mask,
'path' => 'files',
]);
// A user home storage keeps the shared files/ tree next to sibling
// directories (files_versions/, files_trashbin/, uploads/, …). Only the
// files/ subtree may be masked so versions/trashbin stay usable (see #59511).
// Jailed storages such as group folders are rooted at their own files area
// and carry no files/ prefix, so DirPermissionsMask would never match and
// the share mask would be bypassed. Mask the whole (already jailed) storage
// in that case.
if ($storage->instanceOfStorage(IHomeStorage::class)) {
return new DirPermissionsMask([
'storage' => $storage,
'mask' => $mask,
'path' => 'files',
]);
}

return new PermissionsMask(['storage' => $storage, 'mask' => $mask]);
});

/** @psalm-suppress MissingClosureParamType */
Expand Down
Loading