mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20284 from nextcloud/bugfix/noid/catch-no-user-in-cron 

Properly catch NoUserException during upload cleanup
This commit is contained in:
Roeland Jago Douma 2020-04-04 10:25:53 +02:00 committed by GitHub
parent 3a0b70696c 56aa8fd035
commit 5c6f9ca278
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/lib/BackgroundJob/UploadCleanup.php
View File

@ -27,6 +27,7 @@ declare(strict_types=1);
namespace OCA\DAV\BackgroundJob;
use OC\User\NoUserException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\TimedJob;
@ -63,7 +64,7 @@ class UploadCleanup extends TimedJob {
$uploads = $userRoot->get('uploads');
/** @var Folder $uploadFolder */
$uploadFolder = $uploads->get($folder);
} catch (NotFoundException $e) {
} catch (NotFoundException|NoUserException $e) {
$this->jobList->remove(self::class, $argument);
return;
}

6
lib/private/Files/Node/Root.php
View File

@ -35,6 +35,7 @@ use OC\Cache\CappedMemoryCache;
use OC\Files\Mount\Manager;
use OC\Files\Mount\MountPoint;
use OC\Hooks\PublicEmitter;
use OC\User\NoUserException;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
@ -352,7 +353,8 @@ class Root extends Folder implements IRootFolder {
*
* @param string $userId user ID
* @return \OCP\Files\Folder
* @throws \OC\User\NoUserException
* @throws NoUserException
* @throws NotPermittedException
*/
public function getUserFolder($userId) {
$userObject = $this->userManager->get($userId);
@ -367,7 +369,7 @@ class Root extends Folder implements IRootFolder {
'app' => 'files',
]
);
throw new \OC\User\NoUserException('Backends provided no user object');
throw new NoUserException('Backends provided no user object');
}
$userId = $userObject->getUID();

4
lib/public/Files/IRootFolder.php
View File

@ -25,6 +25,7 @@
namespace OCP\Files;
use OC\Hooks\Emitter;
use OC\User\NoUserException;
/**
* Interface IRootFolder
@ -39,6 +40,9 @@ interface IRootFolder extends Folder, Emitter {
*
* @param string $userId user ID
* @return \OCP\Files\Folder
* @throws NoUserException
* @throws NotPermittedException
*
* @since 8.2.0
*/
public function getUserFolder($userId);