Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
fix: Pass the mountpoint target user to storages without owner
Storages that do not have a dedicated owner (e.g. groupfolders, external
storages) currently always assume the current session user as the owner.
This leads to several issues when there is no user session but a node is
obtained through a user folder.

In order to have the correct user available we need to pass the user
that is used to setup a mountpoint along to the storage layer as we
generally assume that an owner is available for those.

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
juliusknorr authored and AndyScherzinger committed Sep 3, 2024
commit 53f92e68e69beb2a788b1fd3ad247f5d9ae295c7
1 change: 1 addition & 0 deletions apps/files_external/lib/Config/ConfigAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
}, $storages, $storageConfigs);

$mounts = array_map(function (StorageConfig $storageConfig, Storage\IStorage $storage) use ($user, $loader) {
$storage->setOwner($user->getUID());
if ($storageConfig->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
return new PersonalMount(
$this->userStoragesService,
Expand Down
13 changes: 13 additions & 0 deletions lib/private/Files/Storage/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,19 @@ public function setAvailability($isAvailable) {
$this->getStorageCache()->setAvailability($isAvailable);
}

/**
* Allow setting the storage owner
*
* This can be used for storages that do not have a dedicated owner, where we want to
* pass the user that we setup the mountpoint for along to the storage layer
*
* @param string|null $user
* @return void
*/
public function setOwner(?string $user): void {
$this->owner = $user;
}

/**
* @return bool
*/
Expand Down
4 changes: 4 additions & 0 deletions lib/private/Files/Storage/Wrapper/Wrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -674,4 +674,8 @@ public function isWrapperOf(IStorage $storage) {
}
return false;
}

public function setOwner(?string $user): void {
$this->getWrapperStorage()->setOwner($user);
}
}
12 changes: 12 additions & 0 deletions lib/public/Files/Storage/IStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -460,4 +460,16 @@ public function getUpdater();
* @since 9.0.0
*/
public function getWatcher();

/**
* Allow setting the storage owner
*
* This can be used for storages that do not have a dedicated owner, where we want to
* pass the user that we setup the mountpoint for along to the storage layer
*
* @param string|null $user Owner user id
* @return void
* @since 29.0.0
*/
public function setOwner(?string $user): void;
}