upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge pull request #56223 from nextcloud/artonge/fix/remove_unecessary_condition

Browse source 
fix(View): Normalize path in getAbsolutePath
This commit is contained in:
Louis 2025-11-25 21:55:51 +01:00 committed by GitHub
commit 6c3b698ea3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
View file

@ -8,21 +8,22 @@ declare(strict_types=1);
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,
) {
}
@ -38,11 +39,12 @@ class FileReferenceEventListener implements IEventListener {
*/
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());

9
lib/private/Files/View.php
View file

@ -11,6 +11,7 @@ use Icewind\Streams\CallbackWrapper;
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;
@ -92,13 +93,7 @@ class View {
return null;
}
$this->assertPathLength($path);
if ($path === '') {
$path = '/';
}
if ($path[0] !== '/') {
$path = '/' . $path;
}
return $this->fakeRoot . $path;
return PathHelper::normalizePath($this->fakeRoot . '/' . $path);
}
/**

4
tests/lib/Files/ViewTest.php
View file

@ -917,11 +917,11 @@ class ViewTest extends \Test\TestCase {
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'],
];