Propagate etags across shared storages #14764
There are no files selected for viewing
This file contains 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 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,124 @@ | ||
| <?php | ||
| /** | ||
| * Copyright (c) 2015 Robin Appelman <[email protected]> | ||
| * This file is licensed under the Affero General Public License version 3 or | ||
| * later. | ||
| * See the COPYING-README file. | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing\Appinfo; | ||
|
|
||
| use OCA\Files_Sharing\Helper; | ||
| use OCA\Files_Sharing\MountProvider; | ||
| use OCA\Files_Sharing\Propagation\PropagationManager; | ||
| use OCP\AppFramework\App; | ||
| use OC\AppFramework\Utility\SimpleContainer; | ||
| use OCA\Files_Sharing\Controllers\ExternalSharesController; | ||
| use OCA\Files_Sharing\Controllers\ShareController; | ||
| use OCA\Files_Sharing\Middleware\SharingCheckMiddleware; | ||
| use \OCP\IContainer; | ||
|
|
||
| class Application extends App { | ||
| public function __construct(array $urlParams = array()) { | ||
| parent::__construct('files_sharing', $urlParams); | ||
|
|
||
| $container = $this->getContainer(); | ||
| $server = $container->getServer(); | ||
|
|
||
| /** | ||
| * Controllers | ||
| */ | ||
| $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { | ||
| return new ShareController( | ||
| $c->query('AppName'), | ||
| $c->query('Request'), | ||
| $c->query('UserSession'), | ||
| $server->getAppConfig(), | ||
| $server->getConfig(), | ||
| $c->query('URLGenerator'), | ||
| $c->query('UserManager'), | ||
| $server->getLogger(), | ||
| $server->getActivityManager() | ||
| ); | ||
| }); | ||
| $container->registerService('ExternalSharesController', function (SimpleContainer $c) { | ||
| return new ExternalSharesController( | ||
| $c->query('AppName'), | ||
| $c->query('Request'), | ||
| $c->query('IsIncomingShareEnabled'), | ||
| $c->query('ExternalManager') | ||
| ); | ||
| }); | ||
|
|
||
| /** | ||
| * Core class wrappers | ||
| */ | ||
| $container->registerService('UserSession', function (SimpleContainer $c) use ($server) { | ||
| return $server->getUserSession(); | ||
| }); | ||
| $container->registerService('URLGenerator', function (SimpleContainer $c) use ($server) { | ||
| return $server->getUrlGenerator(); | ||
| }); | ||
| $container->registerService('UserManager', function (SimpleContainer $c) use ($server) { | ||
| return $server->getUserManager(); | ||
| }); | ||
| $container->registerService('IsIncomingShareEnabled', function (SimpleContainer $c) { | ||
| return Helper::isIncomingServer2serverShareEnabled(); | ||
| }); | ||
| $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { | ||
| $user = $server->getUserSession()->getUser(); | ||
| $uid = $user ? $user->getUID() : null; | ||
| return new \OCA\Files_Sharing\External\Manager( | ||
| $server->getDatabaseConnection(), | ||
| \OC\Files\Filesystem::getMountManager(), | ||
| \OC\Files\Filesystem::getLoader(), | ||
| $server->getHTTPHelper(), | ||
| $uid | ||
| ); | ||
| }); | ||
|
|
||
| /** | ||
| * Middleware | ||
| */ | ||
| $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { | ||
| return new SharingCheckMiddleware( | ||
| $c->query('AppName'), | ||
| $server->getConfig(), | ||
| $server->getAppManager() | ||
| ); | ||
| }); | ||
|
|
||
| // Execute middlewares | ||
| $container->registerMiddleware('SharingCheckMiddleware'); | ||
|
|
||
| $container->registerService('MountProvider', function (IContainer $c) { | ||
| /** @var \OCP\IServerContainer $server */ | ||
| $server = $c->query('ServerContainer'); | ||
| return new MountProvider( | ||
| $server->getConfig(), | ||
| $c->query('PropagationManager') | ||
| ); | ||
| }); | ||
|
|
||
| $container->registerService('PropagationManager', function (IContainer $c) { | ||
| /** @var \OCP\IServerContainer $server */ | ||
| $server = $c->query('ServerContainer'); | ||
| return new PropagationManager( | ||
| $server->getUserSession(), | ||
| $server->getConfig() | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| public function registerMountProviders() { | ||
| /** @var \OCP\IServerContainer $server */ | ||
| $server = $this->getContainer()->query('ServerContainer'); | ||
| $mountProviderCollection = $server->getMountProviderCollection(); | ||
| $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); | ||
| } | ||
|
|
||
| public function setupPropagation() { | ||
| $propagationManager = $this->getContainer()->query('PropagationManager'); | ||
| \OCP\Util::connectHook('OC_Filesystem', 'setup', $propagationManager, 'globalSetup'); | ||
| } | ||
| } |
This file contains 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 |
|---|---|---|
|
|
@@ -25,7 +25,6 @@ | |
| */ | ||
| namespace OCA\Files_Sharing\AppInfo; | ||
|
|
||
| use OCP\API; | ||
|
|
||
| $application = new Application(); | ||
|
|
||
This file contains 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 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,72 @@ | ||
| <?php | ||
| /** | ||
| * Copyright (c) 2015 Robin Appelman <[email protected]> | ||
| * This file is licensed under the Affero General Public License version 3 or | ||
| * later. | ||
| * See the COPYING-README file. | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing; | ||
|
|
||
| use OC\Files\Filesystem; | ||
| use OCA\Files_Sharing\Propagation\PropagationManager; | ||
| use OCP\Files\Config\IMountProvider; | ||
| use OCP\Files\Storage\IStorageFactory; | ||
| use OCP\IConfig; | ||
| use OCP\IUser; | ||
|
|
||
| class MountProvider implements IMountProvider { | ||
| /** | ||
| * @var \OCP\IConfig | ||
| */ | ||
| protected $config; | ||
|
|
||
| /** | ||
| * @var \OCA\Files_Sharing\Propagation\PropagationManager | ||
| */ | ||
| protected $propagationManager; | ||
|
|
||
| /** | ||
| * @param \OCP\IConfig $config | ||
| * @param \OCA\Files_Sharing\Propagation\PropagationManager $propagationManager | ||
| */ | ||
| public function __construct(IConfig $config, PropagationManager $propagationManager) { | ||
| $this->config = $config; | ||
| $this->propagationManager = $propagationManager; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Get all mountpoints applicable for the user and check for shares where we need to update the etags | ||
| * | ||
| * @param \OCP\IUser $user | ||
| * @param \OCP\Files\Storage\IStorageFactory $storageFactory | ||
| * @return \OCP\Files\Mount\IMountPoint[] | ||
| */ | ||
| public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) { | ||
| $shares = \OCP\Share::getItemsSharedWithUser('file', $user->getUID()); | ||
| $propagator = $this->propagationManager->getSharePropagator($user->getUID()); | ||
| $propagator->propagateDirtyMountPoints($shares); | ||
| $shares = array_filter($shares, function ($share) { | ||
| return $share['permissions'] > 0; | ||
| }); | ||
| return array_map(function ($share) use ($user, $storageFactory) { | ||
| Filesystem::initMountPoints($share['uid_owner']); | ||
| // for updating etags for the share owner when we make changes to this share. | ||
| $ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']); | ||
|
|
||
| // for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share) | ||
| $this->propagationManager->listenToOwnerChanges($share['uid_owner'], $user->getUID()); | ||
|
There was a problem hiding this comment. So... this one is for the logged in user to listen to changes made by share recipients ? (the dirty shares case ?) There was a problem hiding this comment. If I am user "current_user", this line would listen to changes made by a user "user_recipient1". Can this even happen within this same PHP request ? Is for the situations where we re-setupFS for another user within the same PHP call ? There was a problem hiding this comment. what I mean is that only "current_user" will be able to make changes since we're setting up "current_user" 's FS. "user_recipient1" won't. There was a problem hiding this comment. In light of the new suggested comment, this means that: "The SharePropagator of the user "$user" will listen to the ChangePropagator of the user $share['uid_owner']". |
||
| return new SharedMount( | ||
| '\OC\Files\Storage\Shared', | ||
| '/' . $user->getUID() . '/' . $share['file_target'], | ||
|
There was a problem hiding this comment. note: file_target already contains a leading slash usually, hopefully nothing to worry about |
||
| array( | ||
| 'propagator' => $ownerPropagator, | ||
| 'share' => $share, | ||
| 'user' => $user->getUID() | ||
| ), | ||
| $storageFactory | ||
| ); | ||
| }, $shares); | ||
| } | ||
| } | ||
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.
If I understand well, this doesn't interfere with the current user's mount point and simply mount the mount point of every share owner (in the case of reshares) into their own file tree.
I hope this doesn't become expensive in the long run, if many users are involved with many mount points / unrelated shared mount points. Ideal would be able to only mount the mount points relevant to this interaction.
Perhaps a potential performance improvement for a separate ticket ?
@icewind1991 what do you think ?