sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: rename logged as beforeRename and afterRename, and in both place getInternalPath is used in place of getPath to make it consistent across the logs 

Signed-off-by: yemkareems <yemkareems@gmail.com>
pull/45845/head
yemkareems 2024-06-13 12:59:51 +07:00
parent f06338ca36
commit 3e355c4db1
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/admin_audit/lib/Actions/Files.php
Unescape Escape View File

@ -8,6 +8,7 @@ declare(strict_types=1);
namespace OCA\AdminAudit\Actions;
use OCP\Files\Events\Node\BeforeNodeReadEvent;
use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
use OCP\Files\Events\Node\BeforeNodeWrittenEvent;
use OCP\Files\Events\Node\NodeCopiedEvent;
use OCP\Files\Events\Node\NodeCreatedEvent;
@ -52,16 +53,40 @@ class Files extends Action {
/**
* Logs rename actions of files
*
* @param NodeRenamedEvent $event
* @param BeforeNodeRenamedEvent $event
*/
public function rename(NodeRenamedEvent $event): void {
public function beforeRename(BeforeNodeRenamedEvent $event): void {
try {
$source = $event->getSource();
$params = [
'oldid' => $source->getId(),
'oldpath' => mb_substr($source->getInternalPath(), 5),
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
"Exception thrown in file rename: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
);
return;
}
$this->log(
'File with id "%s" renamed from "%s"',
$params,
array_keys($params)
);
}
/**
* Logs rename actions of files
*
* @param NodeRenamedEvent $event
*/
public function afterRename(NodeRenamedEvent $event): void {
try {
$target = $event->getTarget();
$params = [
'newid' => $target->getId(),
'oldpath' => mb_substr($source->getPath(), 5),
'newpath' => mb_substr($target->getPath(), 5),
'newpath' => mb_substr($target->getInternalPath(), 5),
];
} catch (InvalidPathException|NotFoundException $e) {
\OCP\Server::get(LoggerInterface::class)->error(
@ -71,12 +96,13 @@ class Files extends Action {
}
$this->log(
'File renamed with id "%s" from "%s" to "%s"',
'File with id "%s" renamed to "%s"',
$params,
array_keys($params)
);
}
/**
* Logs creation of files
*

10
apps/admin_audit/lib/AppInfo/Application.php
Unescape Escape View File

@ -32,6 +32,7 @@ use OCP\Authentication\TwoFactorAuth\TwoFactorProviderChallengePassed;
use OCP\Console\ConsoleEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Events\Node\BeforeNodeReadEvent;
use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
use OCP\Files\Events\Node\BeforeNodeWrittenEvent;
use OCP\Files\Events\Node\NodeCopiedEvent;
use OCP\Files\Events\Node\NodeCreatedEvent;
@ -182,7 +183,14 @@ class Application extends App implements IBootstrap {
$eventDispatcher->addListener(
NodeRenamedEvent::class,
function (NodeRenamedEvent $event) use ($fileActions) {
$fileActions->rename($event);
$fileActions->afterRename($event);
}
);
$eventDispatcher->addListener(
BeforeNodeRenamedEvent::class,
function (BeforeNodeRenamedEvent $event) use ($fileActions) {
$fileActions->beforeRename($event);
}
);