Skip to content

[stable26] fix(files_versions): Check for user and owner before call getUserFolder #42289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
solracsf wants to merge 1 commit into from
Closed

[stable26] fix(files_versions): Check for user and owner before call getUserFolder #42289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions apps/files_versions/lib/Listener/FileEventsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,10 @@
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 VersionsMapper $versionsMapper;
/**
* @var array<int, array>
*/
Expand All @@ -75,19 +74,14 @@ class FileEventsListener implements IEventListener {
* @var array<string, Node>
*/
private array $versionsDeleted = [];
private IMimeTypeLoader $mimeTypeLoader;
private LoggerInterface $logger;

public function __construct(
IRootFolder $rootFolder,
VersionsMapper $versionsMapper,
IMimeTypeLoader $mimeTypeLoader,
LoggerInterface $logger,
private IRootFolder $rootFolder,
private IVersionManager $versionManager,

Check failure

Code scanning / Psalm

UndefinedClass

Class, interface or enum named OCA\Files_Versions\Listener\IVersionManager does not exist
private IMimeTypeLoader $mimeTypeLoader,
private IUserSession $userSession,
private LoggerInterface $logger,
) {
$this->rootFolder = $rootFolder;
$this->versionsMapper = $versionsMapper;
$this->mimeTypeLoader = $mimeTypeLoader;
$this->logger = $logger;
}

public function handle(Event $event): void {
Expand Down Expand Up @@ -349,17 +343,23 @@ public function pre_renameOrCopy_hook(Node $source, Node $target): void {

/**
* Retrieve the path relative to the current user root folder.
* If no user is connected, use the node's owner.
* 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())
->getUserFolder($user)
->getRelativePath($node->getPath());
} catch (\Throwable $ex) {
}

$owner = $node->getOwner()?->getUid();

Check notice

Code scanning / Psalm

DocblockTypeContradiction

OCP\IUser does not contain null

Check notice

Code scanning / Psalm

RedundantConditionGivenDocblockType

Docblock-defined type OCP\IUser for $__tmp_nullsafe__11348 is never null
if ($owner) {
return $this->rootFolder
->getUserFolder($node->getOwner()->getUid())
->getUserFolder($owner)
->getRelativePath($node->getPath());
}

return null;
}
}