sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50404 from nextcloud/backport/50353/stable30 

[stable30] feat: Support X-NC-Skip-Trashbin header
pull/50422/head
Andy Scherzinger 2025-01-27 17:05:31 +07:00 committed by GitHub
parent 458856b2f8 6f80c11d94
commit cbd324ff7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
apps/files_trashbin/lib/Storage.php
Unescape Escape View File

@ -10,12 +10,15 @@ use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Wrapper;
use OCA\Files_Trashbin\Events\MoveToTrashEvent;
use OCA\Files_Trashbin\Trash\ITrashManager;
use OCP\App\IAppManager;
use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\Storage\IStorage;
use OCP\IRequest;
use OCP\IUserManager;
use OCP\Server;
use Psr\Log\LoggerInterface;
class Storage extends Wrapper {
@ -43,7 +46,8 @@ class Storage extends Wrapper {
?IUserManager $userManager = null,
?LoggerInterface $logger = null,
?IEventDispatcher $eventDispatcher = null,
?IRootFolder $rootFolder = null
?IRootFolder $rootFolder = null,
private ?IRequest $request = null,
) {
$this->mountPoint = $parameters['mountPoint'];
$this->trashManager = $trashManager;
@ -151,26 +155,26 @@ class Storage extends Wrapper {
* @return bool true if the operation succeeded, false otherwise
*/
private function doDelete($path, $method) {
if (
!\OC::$server->getAppManager()->isEnabledForUser('files_trashbin')
|| (pathinfo($path, PATHINFO_EXTENSION) === 'part')
|| $this->shouldMoveToTrash($path) === false
) {
return call_user_func([$this->storage, $method], $path);
}
$isTrashbinEnabled = Server::get(IAppManager::class)->isEnabledForUser('files_trashbin');
$isPartFile = pathinfo($path, PATHINFO_EXTENSION) === 'part';
$isSkipTrashHeaderSet = $this->request !== null && $this->request->getHeader('X-NC-Skip-Trashbin') === 'true';
// We keep the shouldMoveToTrash call at the end to prevent emitting unnecessary event.
$shouldMoveToTrash = $isTrashbinEnabled && !$isPartFile && !$isSkipTrashHeaderSet && $this->shouldMoveToTrash($path);
if ($shouldMoveToTrash) {
// check permissions before we continue, this is especially important for
// shared files
if (!$this->isDeletable($path)) {
return false;
}
// check permissions before we continue, this is especially important for
// shared files
if (!$this->isDeletable($path)) {
return false;
$isMovedToTrash = $this->trashManager->moveToTrash($this, $path);
if ($isMovedToTrash) {
return true;
}
}
$isMovedToTrash = $this->trashManager->moveToTrash($this, $path);
if (!$isMovedToTrash) {
return call_user_func([$this->storage, $method], $path);
} else {
return true;
}
return call_user_func([$this->storage, $method], $path);
}
/**
@ -182,9 +186,10 @@ class Storage extends Wrapper {
$logger = \OC::$server->get(LoggerInterface::class);
$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
$rootFolder = \OC::$server->get(IRootFolder::class);
$request = \OC::$server->get(IRequest::class);
Filesystem::addStorageWrapper(
'oc_trashbin',
function (string $mountPoint, IStorage $storage) use ($trashManager, $userManager, $logger, $eventDispatcher, $rootFolder) {
function (string $mountPoint, IStorage $storage) use ($trashManager, $userManager, $logger, $eventDispatcher, $rootFolder, $request) {
return new Storage(
['storage' => $storage, 'mountPoint' => $mountPoint],
$trashManager,
@ -192,6 +197,7 @@ class Storage extends Wrapper {
$logger,
$eventDispatcher,
$rootFolder,
$request,
);
},
1);