From ee01d44e7ee3c4ed4c31103589feca1fa6652b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 24 Feb 2025 09:19:09 +0100 Subject: [PATCH] fix(admin_audit): Fix incorrect truncation of files path in admin audit log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/admin_audit/lib/Actions/Files.php | 16 ++++++++-------- .../lib/Listener/FileEventListener.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/admin_audit/lib/Actions/Files.php b/apps/admin_audit/lib/Actions/Files.php index 3993f1a76ee11..f07ed254272ef 100644 --- a/apps/admin_audit/lib/Actions/Files.php +++ b/apps/admin_audit/lib/Actions/Files.php @@ -37,7 +37,7 @@ public function read(BeforeNodeReadEvent $event): void { $node = $event->getNode(); $params = [ 'id' => $node instanceof NonExistingFile ? null : $node->getId(), - 'path' => mb_substr($node->getInternalPath(), 5), + 'path' => $node->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( @@ -76,8 +76,8 @@ public function afterRename(NodeRenamedEvent $event): void { $originalSource = $this->renamedNodes[$target->getId()]; $params = [ 'newid' => $target->getId(), - 'oldpath' => mb_substr($originalSource->getInternalPath(), 5), - 'newpath' => mb_substr($target->getInternalPath(), 5), + 'oldpath' => $originalSource->getPath(), + 'newpath' => $target->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( @@ -101,7 +101,7 @@ public function create(NodeCreatedEvent $event): void { try { $params = [ 'id' => $event->getNode()->getId(), - 'path' => mb_substr($event->getNode()->getInternalPath(), 5), + 'path' => $event->getNode()->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( @@ -127,8 +127,8 @@ public function copy(NodeCopiedEvent $event): void { $params = [ 'oldid' => $event->getSource()->getId(), 'newid' => $event->getTarget()->getId(), - 'oldpath' => mb_substr($event->getSource()->getInternalPath(), 5), - 'newpath' => mb_substr($event->getTarget()->getInternalPath(), 5), + 'oldpath' => $event->getSource()->getPath(), + 'newpath' => $event->getTarget()->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( @@ -151,7 +151,7 @@ public function write(NodeWrittenEvent $event): void { try { $params = [ 'id' => $node->getId(), - 'path' => mb_substr($node->getInternalPath(), 5), + 'path' => $node->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( @@ -177,7 +177,7 @@ public function delete(BeforeNodeDeletedEvent $event): void { try { $params = [ 'id' => $event->getNode()->getId(), - 'path' => mb_substr($event->getNode()->getInternalPath(), 5), + 'path' => $event->getNode()->getPath(), ]; } catch (InvalidPathException|NotFoundException $e) { Server::get(LoggerInterface::class)->error( diff --git a/apps/admin_audit/lib/Listener/FileEventListener.php b/apps/admin_audit/lib/Listener/FileEventListener.php index 4ea3db6aa7d3f..04a106a5adfd7 100644 --- a/apps/admin_audit/lib/Listener/FileEventListener.php +++ b/apps/admin_audit/lib/Listener/FileEventListener.php @@ -40,7 +40,7 @@ private function beforePreviewFetched(BeforePreviewFetchedEvent $event): void { 'height' => $event->getHeight(), 'crop' => $event->isCrop(), 'mode' => $event->getMode(), - 'path' => mb_substr($file->getInternalPath(), 5) + 'path' => $file->getPath(), ]; $this->log( 'Preview accessed: (id: "%s", width: "%s", height: "%s" crop: "%s", mode: "%s", path: "%s")',