upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 16:50:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #51911 from nextcloud/backport/51861/stable30

Browse source 
[stable30] fix: Catch exceptions when expiring trashbin
This commit is contained in:
Louis 2025-04-03 12:28:08 +02:00 committed by GitHub
commit c8bccdea1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
View file

@ -13,6 +13,7 @@ use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IAppConfig;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;
class ExpireTrash extends TimedJob {
@ -20,6 +21,7 @@ class ExpireTrash extends TimedJob {
private IAppConfig $appConfig,
private IUserManager $userManager,
private Expiration $expiration,
private LoggerInterface $logger,
ITimeFactory $time
) {
parent::__construct($time);
@ -43,12 +45,16 @@ class ExpireTrash extends TimedJob {
$users = $this->userManager->getSeenUsers($offset);
foreach ($users as $user) {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
continue;
try {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
continue;
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
} catch (\Throwable $e) {
$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
$offset++;

24
apps/files_trashbin/lib/Command/ExpireTrash.php
View file

@ -11,6 +11,7 @@ use OCA\Files_Trashbin\Helper;
use OCA\Files_Trashbin\Trashbin;
use OCP\IUser;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputArgument;
@ -33,7 +34,8 @@ class ExpireTrash extends Command {
* @param IUserManager|null $userManager
* @param Expiration|null $expiration
*/
public function __construct(?IUserManager $userManager = null,
public function __construct(private LoggerInterface $logger,
?IUserManager $userManager = null,
?Expiration $expiration = null) {
parent::__construct();
@ -74,10 +76,12 @@ class ExpireTrash extends Command {
} else {
$p = new ProgressBar($output);
$p->start();
$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
$users = $this->userManager->getSeenUsers();
foreach ($users as $user) {
$p->advance();
$this->expireTrashForUser($user);
});
}
$p->finish();
$output->writeln('');
}
@ -85,12 +89,16 @@ class ExpireTrash extends Command {
}
public function expireTrashForUser(IUser $user) {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
return;
try {
$uid = $user->getUID();
if (!$this->setupFS($uid)) {
return;
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
} catch (\Throwable $e) {
$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
}
$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
Trashbin::deleteExpiredFiles($dirContent, $uid);
}
/**

9
apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php
View file

@ -14,6 +14,7 @@ use OCP\BackgroundJob\IJobList;
use OCP\IAppConfig;
use OCP\IUserManager;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;
class ExpireTrashTest extends TestCase {
@ -29,6 +30,9 @@ class ExpireTrashTest extends TestCase {
/** @var IJobList&MockObject */
private $jobList;
/** @var LoggerInterface&MockObject */
private $logger;
/** @var ITimeFactory&MockObject */
private $time;
@ -39,6 +43,7 @@ class ExpireTrashTest extends TestCase {
$this->userManager = $this->createMock(IUserManager::class);
$this->expiration = $this->createMock(Expiration::class);
$this->jobList = $this->createMock(IJobList::class);
$this->logger = $this->createMock(LoggerInterface::class);
$this->time = $this->createMock(ITimeFactory::class);
$this->time->method('getTime')
@ -58,7 +63,7 @@ class ExpireTrashTest extends TestCase {
->with('files_trashbin', 'background_job_expire_trash_offset', 0)
->willReturn(0);
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->time);
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
$job->start($this->jobList);
}
@ -69,7 +74,7 @@ class ExpireTrashTest extends TestCase {
$this->expiration->expects($this->never())
->method('getMaxAgeAsTimestamp');
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->time);
$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
$job->start($this->jobList);
}
}