From 669f684434b1996689162c9771742dd6088582a0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 1 Jul 2017 11:41:21 +0200 Subject: [PATCH] Move logic to Application class Signed-off-by: Joas Schilling --- apps/admin_audit/appinfo/app.php | 15 +- apps/admin_audit/lib/AppInfo/Application.php | 151 ++++++++++++++ apps/admin_audit/lib/AuditLogger.php | 209 ------------------- 3 files changed, 152 insertions(+), 223 deletions(-) delete mode 100644 apps/admin_audit/lib/AuditLogger.php diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php index b87b12df8b..fef5b9ef02 100644 --- a/apps/admin_audit/appinfo/app.php +++ b/apps/admin_audit/appinfo/app.php @@ -23,18 +23,5 @@ * */ - $app = new \OCA\AdminAudit\AppInfo\Application(); - -$logger = \OC::$server->getLogger(); -$userSession = \OC::$server->getUserSession(); -$groupManager = \OC::$server->getGroupManager(); -$eventDispatcher = \OC::$server->getEventDispatcher(); - -$auditLogger = new \OCA\AdminAudit\AuditLogger( - $logger, - $userSession, - $groupManager, - $eventDispatcher -); -$auditLogger->registerHooks(); +$app->register(); diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index 26df5e5491..ed9d64590a 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -21,11 +21,162 @@ namespace OCA\AdminAudit\AppInfo; +use OC\Files\Filesystem; +use OC\Files\Node\File; +use OC\Group\Manager; +use OC\User\Session; +use OCA\AdminAudit\Actions\Auth; +use OCA\AdminAudit\Actions\Files; +use OCA\AdminAudit\Actions\GroupManagement; +use OCA\AdminAudit\Actions\Sharing; +use OCA\AdminAudit\Actions\Trashbin; +use OCA\AdminAudit\Actions\UserManagement; +use OCA\AdminAudit\Actions\Versions; use OCP\AppFramework\App; +use OCP\IGroupManager; +use OCP\ILogger; +use OCP\IPreview; +use OCP\IUserSession; +use OCP\Util; +use Symfony\Component\EventDispatcher\GenericEvent; class Application extends App { public function __construct() { parent::__construct('admin_audit'); } + + public function register() { + $this->registerHooks(); + } + + /** + * Register hooks in order to log them + */ + protected function registerHooks() { + $logger = $this->getContainer()->getServer()->getLogger(); + $this->userManagementHooks($logger); + $this->groupHooks($logger); + $this->sharingHooks($logger); + $this->authHooks($logger); + $this->fileHooks($logger); + $this->trashbinHooks($logger); + $this->versionsHooks($logger); + } + + protected function userManagementHooks(ILogger $logger) { + $userActions = new UserManagement($logger); + + Util::connectHook('OC_User', 'post_createUser', $userActions, 'create'); + Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete'); + Util::connectHook('OC_User', 'changeUser', $userActions, 'change'); + + /** @var IUserSession|Session $userSession */ + $userSession = $this->getContainer()->getServer()->getUserSession(); + $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']); + } + + protected function groupHooks(ILogger $logger) { + $groupActions = new GroupManagement($logger); + + /** @var IGroupManager|Manager $groupManager */ + $groupManager = $this->getContainer()->getServer()->getGroupManager(); + $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']); + $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']); + $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']); + $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']); + } + + protected function sharingHooks(ILogger $logger) { + $shareActions = new Sharing($logger); + + Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared'); + Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare'); + Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions'); + Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword'); + Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate'); + Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed'); + } + + protected function authHooks(ILogger $logger) { + $authActions = new Auth($logger); + + Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt'); + Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful'); + Util::connectHook('OC_User', 'logout', $authActions, 'logout'); + } + + protected function fileHooks(ILogger $logger) { + $fileActions = new Files($logger); + $eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher(); + $eventDispatcher->addListener( + IPreview::EVENT, + function(GenericEvent $event) use ($fileActions) { + /** @var File $file */ + $file = $event->getSubject(); + $fileActions->preview([ + 'path' => substr($file->getInternalPath(), 5), + 'width' => $event->getArguments()['width'], + 'height' => $event->getArguments()['height'], + 'crop' => $event->getArguments()['crop'], + 'mode' => $event->getArguments()['mode'] + ]); + } + ); + + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_post_rename, + $fileActions, + 'rename' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_post_create, + $fileActions, + 'create' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_post_copy, + $fileActions, + 'copy' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_post_write, + $fileActions, + 'write' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_post_update, + $fileActions, + 'update' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_read, + $fileActions, + 'read' + ); + Util::connectHook( + Filesystem::CLASSNAME, + Filesystem::signal_delete, + $fileActions, + 'delete' + ); + } + + protected function versionsHooks(ILogger $logger) { + $versionsActions = new Versions($logger); + Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback'); + Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete'); + } + + protected function trashbinHooks(ILogger $logger) { + $trashActions = new Trashbin($logger); + Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete'); + Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore'); + } } diff --git a/apps/admin_audit/lib/AuditLogger.php b/apps/admin_audit/lib/AuditLogger.php deleted file mode 100644 index 0dd3e3b347..0000000000 --- a/apps/admin_audit/lib/AuditLogger.php +++ /dev/null @@ -1,209 +0,0 @@ - - * @copyright Copyright (c) 2017 Lukas Reschke - * - * @author Bjoern Schiessle - * @author Lukas Reschke - * @author Roger Szabo - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -namespace OCA\AdminAudit; - -use OC\Files\Filesystem; -use OC\Files\Node\File; -use OCA\AdminAudit\Actions\Auth; -use OCA\AdminAudit\Actions\Files; -use OCA\AdminAudit\Actions\GroupManagement; -use OCA\AdminAudit\Actions\Sharing; -use OCA\AdminAudit\Actions\Trashbin; -use OCA\AdminAudit\Actions\UserManagement; -use OCA\AdminAudit\Actions\Versions; -use OCP\IGroupManager; -use OCP\ILogger; -use OCP\IPreview; -use OCP\IUserSession; -use OCP\Util; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Component\EventDispatcher\GenericEvent; - -class AuditLogger { - /** @var ILogger */ - private $logger; - /** @var IUserSession */ - private $userSession; - /** @var IGroupManager */ - private $groupManager; - - /** - * AuditLogger constructor. - * - * @param ILogger $logger - * @param IUserSession $userSession - * @param IGroupManager $groupManager - * @param EventDispatcherInterface $eventDispatcher - */ - public function __construct(ILogger $logger, - IUserSession $userSession, - IGroupManager $groupManager, - EventDispatcherInterface $eventDispatcher) { - $this->logger = $logger; - $this->userSession = $userSession; - $this->groupManager = $groupManager; - $this->eventDispatcher = $eventDispatcher; - } - - /** - * Register hooks in order to log them - */ - public function registerHooks() { - $this->userManagementHooks(); - $this->groupHooks(); - $this->sharingHooks(); - $this->authHooks(); - $this->fileHooks(); - $this->trashbinHooks(); - $this->versionsHooks(); - } - - /** - * Connect to user management hooks - */ - private function userManagementHooks() { - $userActions = new UserManagement($this->logger); - - Util::connectHook('OC_User', 'post_createUser', $userActions, 'create'); - Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete'); - Util::connectHook('OC_User', 'changeUser', $userActions, 'change'); - $this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']); - } - - private function groupHooks() { - $groupActions = new GroupManagement($this->logger); - $this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']); - $this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']); - $this->groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']); - $this->groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']); - } - - /** - * connect to sharing events - */ - private function sharingHooks() { - $shareActions = new Sharing($this->logger); - - Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared'); - Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare'); - Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions'); - Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword'); - Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate'); - Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed'); - } - - /** - * connect to authentication event and related actions - */ - private function authHooks() { - $authActions = new Auth($this->logger); - - Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt'); - Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful'); - Util::connectHook('OC_User', 'logout', $authActions, 'logout'); - } - - /** - * Connect to file hooks - */ - private function fileHooks() { - $fileActions = new Files($this->logger); - $this->eventDispatcher->addListener( - IPreview::EVENT, - function(GenericEvent $event) use ($fileActions) { - /** @var File $file */ - $file = $event->getSubject(); - $fileActions->preview([ - 'path' => substr($file->getInternalPath(), 5), - 'width' => $event->getArguments()['width'], - 'height' => $event->getArguments()['height'], - 'crop' => $event->getArguments()['crop'], - 'mode' => $event->getArguments()['mode'] - ]); - } - ); - - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_post_rename, - $fileActions, - 'rename' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_post_create, - $fileActions, - 'create' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_post_copy, - $fileActions, - 'copy' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_post_write, - $fileActions, - 'write' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_post_update, - $fileActions, - 'update' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_read, - $fileActions, - 'read' - ); - Util::connectHook( - Filesystem::CLASSNAME, - Filesystem::signal_delete, - $fileActions, - 'delete' - ); - } - - public function versionsHooks() { - $versionsActions = new Versions($this->logger); - Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback'); - Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete'); - } - - /** - * Connect to trash bin hooks - */ - private function trashbinHooks() { - $trashActions = new Trashbin($this->logger); - Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete'); - Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore'); - } - -}