Skip to content

fix(View): Normalize path in getAbsolutePath #56223

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

Merged
artonge merged 2 commits into from
Nov 25, 2025
Merged

fix(View): Normalize path in getAbsolutePath #56223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b344b53
fix(collaboration): Replace NonExisting* check on `NodeDeletedEvent` …
artonge Nov 5, 2025
73c6b17
fix(View): Normalize path in `getAbsolutePath`
artonge Nov 6, 2025
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
14 changes: 8 additions & 6 deletions lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@

namespace OC\Collaboration\Reference\File;

use OC\Files\Node\NonExistingFile;
use OC\Files\Node\NonExistingFolder;
use OCP\Collaboration\Reference\IReferenceManager;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\EventDispatcher\IEventListener;
use OCP\Files\Events\Node\NodeDeletedEvent;
use OCP\Files\Events\Node\NodeRenamedEvent;
use OCP\Files\NotFoundException;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;
use Psr\Log\LoggerInterface;

/** @template-implements IEventListener<Event|NodeDeletedEvent|ShareDeletedEvent|ShareCreatedEvent> */
class FileReferenceEventListener implements IEventListener {
public function __construct(
private IReferenceManager $manager,
private LoggerInterface $logger,
) {
}

Expand All @@ -38,11 +39,12 @@ public static function register(IEventDispatcher $eventDispatcher): void {
*/
public function handle(Event $event): void {
if ($event instanceof NodeDeletedEvent) {
if ($event->getNode() instanceof NonExistingFolder || $event->getNode() instanceof NonExistingFile) {
return;
try {
$this->manager->invalidateCache((string)$event->getNode()->getId());
} catch (NotFoundException $e) {
// Non existing node might not have an id
$this->logger->debug('Could not invalidate reference cache for deleted node', ['exception' => $e]);
}

$this->manager->invalidateCache((string)$event->getNode()->getId());
}
if ($event instanceof NodeRenamedEvent) {
$this->manager->invalidateCache((string)$event->getTarget()->getId());
Expand Down
9 changes: 2 additions & 7 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OC\Files\Mount\MoveableMount;
use OC\Files\Storage\Storage;
use OC\Files\Storage\Wrapper\Quota;
use OC\Files\Utils\PathHelper;
use OC\Share\Share;
use OC\User\LazyUser;
use OC\User\Manager as UserManager;
Expand Down Expand Up @@ -92,13 +93,7 @@ public function getAbsolutePath($path = '/'): ?string {
return null;
}
$this->assertPathLength($path);
if ($path === '') {
$path = '/';
}
if ($path[0] !== '/') {
$path = '/' . $path;
}
return $this->fakeRoot . $path;
return PathHelper::normalizePath($this->fakeRoot . '/' . $path);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Files/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,11 +917,11 @@ public function testPartFileInfo(): void {

public static function absolutePathProvider(): array {
return [
['/files/', ''],
['/files', ''],
['/files/0', '0'],
['/files/false', 'false'],
['/files/true', 'true'],
['/files/', '/'],
['/files', '/'],
['/files/test', 'test'],
['/files/test', '/test'],
];
Expand Down
Loading