nextcloud / server

apps/admin_audit/lib/AppInfo/Application.php

Indentation +174 added lines, -174 removed lines

@@ -74,207 +74,207 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var LoggerInterface */
-	protected $logger;
+    /** @var LoggerInterface */
+    protected $logger;
 
-	public function __construct() {
-		parent::__construct('admin_audit');
-	}
+    public function __construct() {
+        parent::__construct('admin_audit');
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
-			return new AuditLogger($c->get(ILogFactory::class), $c->get(Iconfig::class));
-		});
+    public function register(IRegistrationContext $context): void {
+        $context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
+            return new AuditLogger($c->get(ILogFactory::class), $c->get(Iconfig::class));
+        });
 
-		$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
-	}
+        $context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		/** @var IAuditLogger $logger */
-		$logger = $context->getAppContainer()->get(IAuditLogger::class);
+    public function boot(IBootContext $context): void {
+        /** @var IAuditLogger $logger */
+        $logger = $context->getAppContainer()->get(IAuditLogger::class);
 
-		/*
+        /*
 		 * TODO: once the hooks are migrated to lazy events, this should be done
 		 *       in \OCA\AdminAudit\AppInfo\Application::register
 		 */
-		$this->registerHooks($logger, $context->getServerContainer());
-	}
+        $this->registerHooks($logger, $context->getServerContainer());
+    }
 
-	/**
-	 * Register hooks in order to log them
-	 */
-	private function registerHooks(IAuditLogger $logger,
-									 IServerContainer $serverContainer): void {
-		$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
-		$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
-		$this->authHooks($logger);
+    /**
+     * Register hooks in order to log them
+     */
+    private function registerHooks(IAuditLogger $logger,
+                                        IServerContainer $serverContainer): void {
+        $this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
+        $this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
+        $this->authHooks($logger);
 
-		/** @var EventDispatcherInterface $eventDispatcher */
-		$eventDispatcher = $serverContainer->get(EventDispatcherInterface::class);
-		$this->consoleHooks($logger, $eventDispatcher);
-		$this->appHooks($logger, $eventDispatcher);
+        /** @var EventDispatcherInterface $eventDispatcher */
+        $eventDispatcher = $serverContainer->get(EventDispatcherInterface::class);
+        $this->consoleHooks($logger, $eventDispatcher);
+        $this->appHooks($logger, $eventDispatcher);
 
-		$this->sharingHooks($logger);
+        $this->sharingHooks($logger);
 
-		$this->fileHooks($logger, $eventDispatcher);
-		$this->trashbinHooks($logger);
-		$this->versionsHooks($logger);
+        $this->fileHooks($logger, $eventDispatcher);
+        $this->trashbinHooks($logger);
+        $this->versionsHooks($logger);
 
-		$this->securityHooks($logger, $eventDispatcher);
-	}
+        $this->securityHooks($logger, $eventDispatcher);
+    }
 
-	private function userManagementHooks(IAuditLogger $logger,
-										 IUserSession $userSession): void {
-		$userActions = new UserManagement($logger);
+    private function userManagementHooks(IAuditLogger $logger,
+                                            IUserSession $userSession): void {
+        $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');
+        Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+        Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
 
-		assert($userSession instanceof UserSession);
-		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
-		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
-	}
+        assert($userSession instanceof UserSession);
+        $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+        $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
+        $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
+    }
 
-	private function groupHooks(IAuditLogger $logger,
-								IGroupManager $groupManager): void {
-		$groupActions = new GroupManagement($logger);
+    private function groupHooks(IAuditLogger $logger,
+                                IGroupManager $groupManager): void {
+        $groupActions = new GroupManagement($logger);
 
-		assert($groupManager instanceof GroupManager);
-		$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']);
-	}
+        assert($groupManager instanceof GroupManager);
+        $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']);
+    }
 
-	private function sharingHooks(IAuditLogger $logger): void {
-		$shareActions = new Sharing($logger);
+    private function sharingHooks(IAuditLogger $logger): void {
+        $shareActions = new Sharing($logger);
 
-		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
-		Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
+        Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
+        Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
+    }
 
-	private function authHooks(IAuditLogger $logger): void {
-		$authActions = new Auth($logger);
+    private function authHooks(IAuditLogger $logger): void {
+        $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');
-	}
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
 
-	private function appHooks(IAuditLogger $logger,
-							  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableApp($event->getAppID());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->disableApp($event->getAppID());
-		});
-	}
+    private function appHooks(IAuditLogger $logger,
+                                EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableApp($event->getAppID());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->disableApp($event->getAppID());
+        });
+    }
 
-	private function consoleHooks(IAuditLogger $logger,
-								  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
-			$appActions = new Console($logger);
-			$appActions->runCommand($event->getArguments());
-		});
-	}
+    private function consoleHooks(IAuditLogger $logger,
+                                    EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+            $appActions = new Console($logger);
+            $appActions->runCommand($event->getArguments());
+        });
+    }
 
-	private function fileHooks(IAuditLogger $logger,
-							   EventDispatcherInterface $eventDispatcher): void {
-		$fileActions = new Files($logger);
-		$eventDispatcher->addListener(
-			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => mb_substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode' => $event->getArguments()['mode']
-				]);
-			}
-		);
+    private function fileHooks(IAuditLogger $logger,
+                                EventDispatcherInterface $eventDispatcher): void {
+        $fileActions = new Files($logger);
+        $eventDispatcher->addListener(
+            IPreview::EVENT,
+            function (GenericEvent $event) use ($fileActions) {
+                /** @var File $file */
+                $file = $event->getSubject();
+                $fileActions->preview([
+                    'path' => mb_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'
-		);
-	}
+        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'
+        );
+    }
 
-	private function versionsHooks(IAuditLogger $logger): void {
-		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
-	}
+    private function versionsHooks(IAuditLogger $logger): void {
+        $versionsActions = new Versions($logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
+    }
 
-	private function trashbinHooks(IAuditLogger $logger): void {
-		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
+    private function trashbinHooks(IAuditLogger $logger): void {
+        $trashActions = new Trashbin($logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
 
-	private function securityHooks(IAuditLogger $logger,
-								   EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
-		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorFailed($event->getSubject(), $event->getArguments());
-		});
-	}
+    private function securityHooks(IAuditLogger $logger,
+                                    EventDispatcherInterface $eventDispatcher): void {
+        $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorSuccess($event->getSubject(), $event->getArguments());
+        });
+        $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorFailed($event->getSubject(), $event->getArguments());
+        });
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -82,7 +82,7 @@ 
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
+		$context->registerService(IAuditLogger::class, function(ContainerInterface $c) {
 			return new AuditLogger($c->get(ILogFactory::class), $c->get(Iconfig::class));
 		});
 
@@ -170,15 +170,15 @@ 
 
 	private function appHooks(IAuditLogger $logger,
 							  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->disableApp($event->getAppID());
 		});
@@ -186,7 +186,7 @@ 
 
 	private function consoleHooks(IAuditLogger $logger,
 								  EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
@@ -197,7 +197,7 @@ 
 		$fileActions = new Files($logger);
 		$eventDispatcher->addListener(
 			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
+			function(GenericEvent $event) use ($fileActions) {
 				/** @var File $file */
 				$file = $event->getSubject();
 				$fileActions->preview([
@@ -268,11 +268,11 @@ 
 
 	private function securityHooks(IAuditLogger $logger,
 								   EventDispatcherInterface $eventDispatcher): void {
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
 		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorFailed($event->getSubject(), $event->getArguments());
 		});

apps/admin_audit/lib/Actions/Action.php

Indentation +53 added lines, -53 removed lines

@@ -31,61 +31,61 @@
 use OCA\AdminAudit\IAuditLogger;
 
 class Action {
-	/** @var IAuditLogger */
-	private $logger;
+    /** @var IAuditLogger */
+    private $logger;
 
-	public function __construct(IAuditLogger $logger) {
-		$this->logger = $logger;
-	}
+    public function __construct(IAuditLogger $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log a single action with a log level of info
-	 *
-	 * @param string $text
-	 * @param array $params
-	 * @param array $elements
-	 * @param bool $obfuscateParameters
-	 */
-	public function log(string $text,
-						array $params,
-						array $elements,
-						bool $obfuscateParameters = false): void {
-		foreach ($elements as $element) {
-			if (!isset($params[$element])) {
-				if ($obfuscateParameters) {
-					$this->logger->critical(
-						'$params["'.$element.'"] was missing.',
-						['app' => 'admin_audit']
-					);
-				} else {
-					$this->logger->critical(
-						sprintf(
-							'$params["'.$element.'"] was missing. Transferred value: %s',
-							print_r($params, true)
-						),
-						['app' => 'admin_audit']
-					);
-				}
-				return;
-			}
-		}
+    /**
+     * Log a single action with a log level of info
+     *
+     * @param string $text
+     * @param array $params
+     * @param array $elements
+     * @param bool $obfuscateParameters
+     */
+    public function log(string $text,
+                        array $params,
+                        array $elements,
+                        bool $obfuscateParameters = false): void {
+        foreach ($elements as $element) {
+            if (!isset($params[$element])) {
+                if ($obfuscateParameters) {
+                    $this->logger->critical(
+                        '$params["'.$element.'"] was missing.',
+                        ['app' => 'admin_audit']
+                    );
+                } else {
+                    $this->logger->critical(
+                        sprintf(
+                            '$params["'.$element.'"] was missing. Transferred value: %s',
+                            print_r($params, true)
+                        ),
+                        ['app' => 'admin_audit']
+                    );
+                }
+                return;
+            }
+        }
 
-		$replaceArray = [];
-		foreach ($elements as $element) {
-			if ($params[$element] instanceof \DateTime) {
-				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
-			}
-			$replaceArray[] = $params[$element];
-		}
+        $replaceArray = [];
+        foreach ($elements as $element) {
+            if ($params[$element] instanceof \DateTime) {
+                $params[$element] = $params[$element]->format('Y-m-d H:i:s');
+            }
+            $replaceArray[] = $params[$element];
+        }
 
-		$this->logger->info(
-			vsprintf(
-				$text,
-				$replaceArray
-			),
-			[
-				'app' => 'admin_audit'
-			]
-		);
-	}
+        $this->logger->info(
+            vsprintf(
+                $text,
+                $replaceArray
+            ),
+            [
+                'app' => 'admin_audit'
+            ]
+        );
+    }
 }

apps/admin_audit/lib/AuditLogger.php

Indentation +53 added lines, -53 removed lines

@@ -32,57 +32,57 @@
  */
 class AuditLogger implements IAuditLogger {
 
-	/** @var LoggerInterface */
-	private $parentLogger;
-
-	public function __construct(ILogFactory $logFactory, IConfig $config) {
-		$auditType = $config->getSystemValueString('log_type_audit', 'file');
-		$defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
-		$auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
-		$logFile = $config->getSystemValueString('logfile_audit', '');
-
-		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-			// Legacy way was appconfig, now it's paralleled with the normal log config
-			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		}
-
-		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
-	}
-
-	public function emergency($message, array $context = array()) {
-		$this->parentLogger->emergency($message, $context);
-	}
-
-	public function alert($message, array $context = array()) {
-		$this->parentLogger->alert($message, $context);
-	}
-
-	public function critical($message, array $context = array()) {
-		$this->parentLogger->critical($message, $context);
-	}
-
-	public function error($message, array $context = array()) {
-		$this->parentLogger->error($message, $context);
-	}
-
-	public function warning($message, array $context = array()) {
-		$this->parentLogger->warning($message, $context);
-	}
-
-	public function notice($message, array $context = array()) {
-		$this->parentLogger->notice($message, $context);
-	}
-
-	public function info($message, array $context = array()) {
-		$this->parentLogger->info($message, $context);
-	}
-
-	public function debug($message, array $context = array()) {
-		$this->parentLogger->debug($message, $context);
-	}
-
-	public function log($level, $message, array $context = array()) {
-		$this->parentLogger->log($level, $message, $context);
-	}
+    /** @var LoggerInterface */
+    private $parentLogger;
+
+    public function __construct(ILogFactory $logFactory, IConfig $config) {
+        $auditType = $config->getSystemValueString('log_type_audit', 'file');
+        $defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
+        $auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
+        $logFile = $config->getSystemValueString('logfile_audit', '');
+
+        if ($auditType === 'file' && !$logFile) {
+            $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+            // Legacy way was appconfig, now it's paralleled with the normal log config
+            $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+        }
+
+        $this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
+    }
+
+    public function emergency($message, array $context = array()) {
+        $this->parentLogger->emergency($message, $context);
+    }
+
+    public function alert($message, array $context = array()) {
+        $this->parentLogger->alert($message, $context);
+    }
+
+    public function critical($message, array $context = array()) {
+        $this->parentLogger->critical($message, $context);
+    }
+
+    public function error($message, array $context = array()) {
+        $this->parentLogger->error($message, $context);
+    }
+
+    public function warning($message, array $context = array()) {
+        $this->parentLogger->warning($message, $context);
+    }
+
+    public function notice($message, array $context = array()) {
+        $this->parentLogger->notice($message, $context);
+    }
+
+    public function info($message, array $context = array()) {
+        $this->parentLogger->info($message, $context);
+    }
+
+    public function debug($message, array $context = array()) {
+        $this->parentLogger->debug($message, $context);
+    }
+
+    public function log($level, $message, array $context = array()) {
+        $this->parentLogger->log($level, $message, $context);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$logFile = $config->getSystemValueString('logfile_audit', '');
 
 		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 			// Legacy way was appconfig, now it's paralleled with the normal log config
 			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 		}

apps/admin_audit/composer/composer/autoload_classmap.php

Spacing +17 added lines, -17 removed lines

@@ -6,21 +6,21 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
-    'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
-    'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',
-    'OCA\\AdminAudit\\Actions\\Console' => $baseDir . '/../lib/Actions/Console.php',
-    'OCA\\AdminAudit\\Actions\\Files' => $baseDir . '/../lib/Actions/Files.php',
-    'OCA\\AdminAudit\\Actions\\GroupManagement' => $baseDir . '/../lib/Actions/GroupManagement.php',
-    'OCA\\AdminAudit\\Actions\\Security' => $baseDir . '/../lib/Actions/Security.php',
-    'OCA\\AdminAudit\\Actions\\Sharing' => $baseDir . '/../lib/Actions/Sharing.php',
-    'OCA\\AdminAudit\\Actions\\Trashbin' => $baseDir . '/../lib/Actions/Trashbin.php',
-    'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir . '/../lib/Actions/UserManagement.php',
-    'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
-    'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\AdminAudit\\AuditLogger' => $baseDir . '/../lib/AuditLogger.php',
-    'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
-    'OCA\\AdminAudit\\IAuditLogger' => $baseDir . '/../lib/IAuditLogger.php',
-    'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\AdminAudit\\Actions\\Action' => $baseDir.'/../lib/Actions/Action.php',
+    'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir.'/../lib/Actions/AppManagement.php',
+    'OCA\\AdminAudit\\Actions\\Auth' => $baseDir.'/../lib/Actions/Auth.php',
+    'OCA\\AdminAudit\\Actions\\Console' => $baseDir.'/../lib/Actions/Console.php',
+    'OCA\\AdminAudit\\Actions\\Files' => $baseDir.'/../lib/Actions/Files.php',
+    'OCA\\AdminAudit\\Actions\\GroupManagement' => $baseDir.'/../lib/Actions/GroupManagement.php',
+    'OCA\\AdminAudit\\Actions\\Security' => $baseDir.'/../lib/Actions/Security.php',
+    'OCA\\AdminAudit\\Actions\\Sharing' => $baseDir.'/../lib/Actions/Sharing.php',
+    'OCA\\AdminAudit\\Actions\\Trashbin' => $baseDir.'/../lib/Actions/Trashbin.php',
+    'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir.'/../lib/Actions/UserManagement.php',
+    'OCA\\AdminAudit\\Actions\\Versions' => $baseDir.'/../lib/Actions/Versions.php',
+    'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\AdminAudit\\AuditLogger' => $baseDir.'/../lib/AuditLogger.php',
+    'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir.'/../lib/BackgroundJobs/Rotate.php',
+    'OCA\\AdminAudit\\IAuditLogger' => $baseDir.'/../lib/IAuditLogger.php',
+    'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir.'/../lib/Listener/CriticalActionPerformedEventListener.php',
 );

apps/admin_audit/composer/composer/autoload_static.php

Spacing +24 added lines, -24 removed lines

@@ -6,43 +6,43 @@
 
 class ComposerStaticInitAdminAudit
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\AdminAudit\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\AdminAudit\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
-        'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
-        'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',
-        'OCA\\AdminAudit\\Actions\\Console' => __DIR__ . '/..' . '/../lib/Actions/Console.php',
-        'OCA\\AdminAudit\\Actions\\Files' => __DIR__ . '/..' . '/../lib/Actions/Files.php',
-        'OCA\\AdminAudit\\Actions\\GroupManagement' => __DIR__ . '/..' . '/../lib/Actions/GroupManagement.php',
-        'OCA\\AdminAudit\\Actions\\Security' => __DIR__ . '/..' . '/../lib/Actions/Security.php',
-        'OCA\\AdminAudit\\Actions\\Sharing' => __DIR__ . '/..' . '/../lib/Actions/Sharing.php',
-        'OCA\\AdminAudit\\Actions\\Trashbin' => __DIR__ . '/..' . '/../lib/Actions/Trashbin.php',
-        'OCA\\AdminAudit\\Actions\\UserManagement' => __DIR__ . '/..' . '/../lib/Actions/UserManagement.php',
-        'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
-        'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\AdminAudit\\AuditLogger' => __DIR__ . '/..' . '/../lib/AuditLogger.php',
-        'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
-        'OCA\\AdminAudit\\IAuditLogger' => __DIR__ . '/..' . '/../lib/IAuditLogger.php',
-        'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__ . '/..' . '/../lib/Listener/CriticalActionPerformedEventListener.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\AdminAudit\\Actions\\Action' => __DIR__.'/..'.'/../lib/Actions/Action.php',
+        'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__.'/..'.'/../lib/Actions/AppManagement.php',
+        'OCA\\AdminAudit\\Actions\\Auth' => __DIR__.'/..'.'/../lib/Actions/Auth.php',
+        'OCA\\AdminAudit\\Actions\\Console' => __DIR__.'/..'.'/../lib/Actions/Console.php',
+        'OCA\\AdminAudit\\Actions\\Files' => __DIR__.'/..'.'/../lib/Actions/Files.php',
+        'OCA\\AdminAudit\\Actions\\GroupManagement' => __DIR__.'/..'.'/../lib/Actions/GroupManagement.php',
+        'OCA\\AdminAudit\\Actions\\Security' => __DIR__.'/..'.'/../lib/Actions/Security.php',
+        'OCA\\AdminAudit\\Actions\\Sharing' => __DIR__.'/..'.'/../lib/Actions/Sharing.php',
+        'OCA\\AdminAudit\\Actions\\Trashbin' => __DIR__.'/..'.'/../lib/Actions/Trashbin.php',
+        'OCA\\AdminAudit\\Actions\\UserManagement' => __DIR__.'/..'.'/../lib/Actions/UserManagement.php',
+        'OCA\\AdminAudit\\Actions\\Versions' => __DIR__.'/..'.'/../lib/Actions/Versions.php',
+        'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\AdminAudit\\AuditLogger' => __DIR__.'/..'.'/../lib/AuditLogger.php',
+        'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__.'/..'.'/../lib/BackgroundJobs/Rotate.php',
+        'OCA\\AdminAudit\\IAuditLogger' => __DIR__.'/..'.'/../lib/IAuditLogger.php',
+        'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__.'/..'.'/../lib/Listener/CriticalActionPerformedEventListener.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitAdminAudit::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitAdminAudit::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitAdminAudit::$classMap;