-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
[stable27] fix(isLegitimatedForUserId): Setup mountpoints to check file access #41082
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| * | ||
| * @author Arthur Schiwon <[email protected]> | ||
| * @author Christoph Wurst <[email protected]> | ||
| * @author Jonas Meurer <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -26,6 +27,8 @@ | |
| */ | ||
| namespace OCA\WorkflowEngine\Entity; | ||
|
|
||
| use OC\Files\Config\UserMountCache; | ||
| use OC\Files\Mount\Manager as MountManager; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\GenericEvent; | ||
| use OCP\Files\InvalidPathException; | ||
|
|
@@ -38,7 +41,6 @@ | |
| use OCP\IUser; | ||
| use OCP\IUserManager; | ||
| use OCP\IUserSession; | ||
| use OCP\Share\IManager as ShareManager; | ||
| use OCP\SystemTag\ISystemTag; | ||
| use OCP\SystemTag\ISystemTagManager; | ||
| use OCP\SystemTag\MapperEvent; | ||
|
|
@@ -65,8 +67,6 @@ class File implements IEntity, IDisplayText, IUrl, IIcon, IContextPortation { | |
| protected $eventName; | ||
| /** @var Event */ | ||
| protected $event; | ||
| /** @var ShareManager */ | ||
| private $shareManager; | ||
| /** @var IUserSession */ | ||
| private $userSession; | ||
| /** @var ISystemTagManager */ | ||
|
|
@@ -77,25 +77,31 @@ class File implements IEntity, IDisplayText, IUrl, IIcon, IContextPortation { | |
| private $actingUser = null; | ||
| /** @var IUserManager */ | ||
| private $userManager; | ||
| /** @var UserMountCache */ | ||
| private $userMountCache; | ||
| /** @var MountManager */ | ||
| private $mountManager; | ||
|
|
||
| public function __construct( | ||
| IL10N $l10n, | ||
| IURLGenerator $urlGenerator, | ||
| IRootFolder $root, | ||
| ILogger $logger, | ||
| ShareManager $shareManager, | ||
| IUserSession $userSession, | ||
| ISystemTagManager $tagManager, | ||
| IUserManager $userManager | ||
| IUserManager $userManager, | ||
| UserMountCache $userMountCache, | ||
| MountManager $mountManager | ||
| ) { | ||
| $this->l10n = $l10n; | ||
| $this->urlGenerator = $urlGenerator; | ||
| $this->root = $root; | ||
| $this->logger = $logger; | ||
| $this->shareManager = $shareManager; | ||
| $this->userSession = $userSession; | ||
| $this->tagManager = $tagManager; | ||
| $this->userManager = $userManager; | ||
| $this->userMountCache = $userMountCache; | ||
| $this->mountManager = $mountManager; | ||
| } | ||
|
|
||
| public function getName(): string { | ||
|
|
@@ -140,8 +146,22 @@ public function isLegitimatedForUserId(string $uid): bool { | |
| if ($node->getOwner()->getUID() === $uid) { | ||
| return true; | ||
| } | ||
| $acl = $this->shareManager->getAccessList($node, true, true); | ||
| return isset($acl['users']) && array_key_exists($uid, $acl['users']); | ||
|
|
||
| if ($this->eventName === self::EVENT_NAMESPACE . 'postDelete') { | ||
| // At postDelete, the file no longer exists. Check for parent folder instead. | ||
| $fileId = $node->getParent()->getId(); | ||
| } else { | ||
| $fileId = $node->getId(); | ||
| } | ||
|
|
||
| $mountInfos = $this->userMountCache->getMountsForFileId($fileId, $uid); | ||
| foreach ($mountInfos as $mountInfo) { | ||
| $mount = $this->mountManager->getMountFromMountInfo($mountInfo); | ||
| if ($mount && $mount->getStorage() && !empty($mount->getStorage()->getCache()->get($fileId))) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } catch (NotFoundException $e) { | ||
| return false; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| * @author Robin Appelman <[email protected]> | ||
| * @author Robin McCorkell <[email protected]> | ||
| * @author Roeland Jago Douma <[email protected]> | ||
| * @author Jonas <[email protected]> | ||
| * | ||
| * @license AGPL-3.0 | ||
| * | ||
|
|
@@ -33,6 +34,7 @@ | |
| use OC\Files\Filesystem; | ||
| use OC\Files\SetupManager; | ||
| use OC\Files\SetupManagerFactory; | ||
| use OCP\Files\Config\ICachedMountInfo; | ||
| use OCP\Files\Mount\IMountManager; | ||
| use OCP\Files\Mount\IMountPoint; | ||
| use OCP\Files\NotFoundException; | ||
|
|
@@ -226,4 +228,21 @@ public function getMountsByMountProvider(string $path, array $mountProviders) { | |
| }); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Return the mount matching a cached mount info (or mount file info) | ||
| * | ||
| * @param ICachedMountInfo $info | ||
| * | ||
| * @return IMountPoint|null | ||
| */ | ||
| public function getMountFromMountInfo(ICachedMountInfo $info): ?IMountPoint { | ||
| $this->setupManager->setupForPath($info->getMountPoint()); | ||
| foreach ($this->mounts as $mount) { | ||
| if ($mount->getMountPoint() === $info->getMountPoint()) { | ||
| return $mount; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / Psalm
PossiblyNullReference