upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-14 21:48:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

Merge pull request #41749 from nextcloud/checkUserOwner

Browse source 
fix(files_versions): Check for user and owner before call getUserFolder
This commit is contained in:
Ferdinand Thiessen 2023-11-27 19:16:03 +01:00 committed by GitHub
commit 5d669abd11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/files_versions/lib/Listener/FileEventsListener.php
View file

@ -59,11 +59,10 @@ use OCP\Files\Folder;
use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;
class FileEventsListener implements IEventListener {
private IRootFolder $rootFolder;
private IVersionManager $versionManager;
/**
* @var array<int, array>
*/
@ -76,19 +75,14 @@ class FileEventsListener implements IEventListener {
* @var array<string, Node>
*/
private array $versionsDeleted = [];
private IMimeTypeLoader $mimeTypeLoader;
private LoggerInterface $logger;
public function __construct(
IRootFolder $rootFolder,
IVersionManager $versionManager,
IMimeTypeLoader $mimeTypeLoader,
LoggerInterface $logger,
private IRootFolder $rootFolder,
private IVersionManager $versionManager,
private IMimeTypeLoader $mimeTypeLoader,
private IUserSession $userSession,
private LoggerInterface $logger,
) {
$this->rootFolder = $rootFolder;
$this->versionManager = $versionManager;
$this->mimeTypeLoader = $mimeTypeLoader;
$this->logger = $logger;
}
public function handle(Event $event): void {
@ -354,18 +348,20 @@ class FileEventsListener implements IEventListener {
* If no user is connected, try to use the node's owner.
*/
private function getPathForNode(Node $node): ?string {
try {
$user = $this->userSession->getUser()?->getUID();
if ($user) {
return $this->rootFolder
->getUserFolder(\OC_User::getUser())
->getRelativePath($node->getPath());
} catch (\Throwable $ex) {
$owner = $node->getOwner();
if ($owner === null) {
return null;
}
return $this->rootFolder
->getUserFolder($owner->getUid())
->getUserFolder($user)
->getRelativePath($node->getPath());
}
$owner = $node->getOwner()?->getUid();
if ($owner) {
return $this->rootFolder
->getUserFolder($owner)
->getRelativePath($node->getPath());
}
return null;
}
}