Active share validation/authoritative mount improvements #57760
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
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
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing\Listener; | ||
|
|
||
| use OCA\Files_Sharing\AppInfo\Application; | ||
| use OCA\Files_Sharing\Config\ConfigLexicon; | ||
| use OCA\Files_Sharing\ShareRecipientUpdater; | ||
| use OCP\Config\IUserConfig; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Files\Events\UserHomeSetupEvent; | ||
|
|
||
| /** | ||
| * Listen to the users filesystem setup being started, to perform any receiving share | ||
| * work that was postponed. | ||
| * | ||
| * @template-implements IEventListener<UserHomeSetupEvent> | ||
| */ | ||
| class UserHomeSetupListener implements IEventListener { | ||
| public function __construct( | ||
| private readonly ShareRecipientUpdater $updater, | ||
| private readonly IUserConfig $userConfig, | ||
| ) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!$event instanceof UserHomeSetupEvent) { | ||
| return; | ||
| } | ||
|
|
||
| $user = $event->getUser(); | ||
| if ($this->userConfig->getValueBool($user->getUID(), Application::APP_ID, ConfigLexicon::USER_NEEDS_SHARE_REFRESH)) { | ||
| $this->updater->updateForUser($user); | ||
| $this->userConfig->setValueBool($user->getUID(), Application::APP_ID, ConfigLexicon::USER_NEEDS_SHARE_REFRESH, 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing; | ||
|
|
||
| use OCP\Files\Config\ICachedMountInfo; | ||
| use OCP\Files\Config\IUserMountCache; | ||
| use OCP\Files\Storage\IStorageFactory; | ||
| use OCP\IUser; | ||
| use OCP\Share\IShare; | ||
|
|
||
| class ShareRecipientUpdater { | ||
| private array $inUpdate = []; | ||
|
|
||
| public function __construct( | ||
| private readonly IUserMountCache $userMountCache, | ||
| private readonly MountProvider $shareMountProvider, | ||
| private readonly ShareTargetValidator $shareTargetValidator, | ||
| private readonly IStorageFactory $storageFactory, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * Validate all received shares for a user | ||
| */ | ||
| public function updateForUser(IUser $user, bool $verifyMountPoints = true, array $ignoreShares = []): void { | ||
| // prevent recursion | ||
| if (isset($this->inUpdate[$user->getUID()])) { | ||
| return; | ||
| } | ||
| $this->inUpdate[$user->getUID()] = true; | ||
|
|
||
| $cachedMounts = $this->userMountCache->getMountsForUser($user); | ||
| $shareMounts = array_filter($cachedMounts, fn (ICachedMountInfo $mount) => $mount->getMountProvider() === MountProvider::class); | ||
| $mountPoints = array_map(fn (ICachedMountInfo $mount) => $mount->getMountPoint(), $cachedMounts); | ||
| $mountsByPath = array_combine($mountPoints, $cachedMounts); | ||
|
|
||
| $shares = $this->shareMountProvider->getSuperSharesForUser($user, $ignoreShares); | ||
|
|
||
| $mountsChanged = count($shares) !== count($shareMounts); | ||
|
Member
There was a problem hiding this comment. What does this mean? Should it be set to default, given that the loop might set it to true? |
||
| foreach ($shares as &$share) { | ||
| [$parentShare, $groupedShares] = $share; | ||
| $mountPoint = '/' . $user->getUID() . '/files/' . trim($parentShare->getTarget(), '/') . '/'; | ||
| $mountKey = $parentShare->getNodeId() . '::' . $mountPoint; | ||
| if (!isset($cachedMounts[$mountKey])) { | ||
| $mountsChanged = true; | ||
| if ($verifyMountPoints) { | ||
| $this->shareTargetValidator->verifyMountPoint($user, $parentShare, $mountsByPath, $groupedShares); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if ($mountsChanged) { | ||
| $newMounts = $this->shareMountProvider->getMountsFromSuperShares($user, $shares, $this->storageFactory); | ||
| $this->userMountCache->registerMounts($user, $newMounts, [MountProvider::class]); | ||
| } | ||
|
|
||
| unset($this->inUpdate[$user->getUID()]); | ||
| } | ||
|
|
||
| /** | ||
| * Validate a single received share for a user | ||
| */ | ||
| public function updateForShare(IUser $user, IShare $share): void { | ||
| $cachedMounts = $this->userMountCache->getMountsForUser($user); | ||
| $mountPoints = array_map(fn (ICachedMountInfo $mount) => $mount->getMountPoint(), $cachedMounts); | ||
| $mountsByPath = array_combine($mountPoints, $cachedMounts); | ||
|
|
||
| $target = $this->shareTargetValidator->verifyMountPoint($user, $share, $mountsByPath, [$share]); | ||
| $mountPoint = '/' . $user->getUID() . '/files/' . trim($target, '/') . '/'; | ||
|
|
||
| $this->userMountCache->addMount($user, $mountPoint, $share->getNode()->getData(), MountProvider::class); | ||
| } | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Date or data?