[stable25] Add ImpersonateEvents for SnappyMail (and others)

js/impersonate_logout.js

@@ -14,10 +14,9 @@ document.addEventListener('DOMContentLoaded', function() {
 		}
 	);
 
-	function logoutHandler(userId) {
+	function logoutHandler() {
 		var promisObj = $.post(
-			OC.generateUrl('apps/impersonate/logout'),
-			{userId: userId}
+			OC.generateUrl('apps/impersonate/logout')
 		).promise()
 
 		promisObj.done(function () {
@@ -27,7 +26,6 @@ document.addEventListener('DOMContentLoaded', function() {
 
 	$('#settings ul li:last').on('click', function (event) {
 		event.preventDefault()
-		var userId = $("#expandDisplayName").text()
-		logoutHandler(userId)
+		logoutHandler()
 	})
 })

lib/Controller/LogoutController.php

@@ -10,6 +10,8 @@
 use OCP\ISession;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCA\Impersonate\Events\EndImpersonateEvent;
 
 class LogoutController extends Controller {
 	/** @var IUserManager */
@@ -20,6 +22,8 @@ class LogoutController extends Controller {
 	private $logger;
 	/** @var ISession */
 	private $session;
+	/** @var IEventDispatcher */
+	private $eventDispatcher;
 
 	/**
 	 * @param string $appName
@@ -34,38 +38,42 @@ public function __construct($appName,
 								IUserManager $userManager,
 								IUserSession $userSession,
 								ISession $session,
-								LoggerInterface $logger) {
+								LoggerInterface $logger,
+								IEventDispatcher $eventDispatcher) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
 		$this->userSession = $userSession;
 		$this->session = $session;
 		$this->logger = $logger;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
 	 * @UseSession
 	 * @NoAdminRequired
 	 */
-	public function logout(string $userId): JSONResponse {
-		$user = $this->session->get('oldUserId');
-		$user = $this->userManager->get($user);
+	public function logout(): JSONResponse {
+		/** @var ?string $impersonatorUid */
+		$impersonatorUid = $this->session->get('oldUserId');
+		$impersonator = $this->userManager->get($impersonatorUid);
 
-		if ($user === null) {
+		if ($impersonator === null) {
 			return new JSONResponse(
-				sprintf(
-					'No user found for %s',
-					$userId
-				),
+				'No impersonating user found.',
 				Http::STATUS_NOT_FOUND
 			);
 		}
 
-		$this->userSession->setUser($user);
+		$impersonatedUser = $this->userSession->getUser();
+
+		$this->eventDispatcher->dispatchTyped(new EndImpersonateEvent($impersonator, $impersonatedUser));
+
+		$this->userSession->setUser($impersonator);
 
 		$this->logger->info(
 			sprintf(
-				'Switching back to previous user %s',
-				$userId
+				'Switching back to previous user %s from user %s',
+				$impersonatorUid, $impersonatedUser->getUID()
 			),
 			[
 				'app' => 'impersonate',

lib/Controller/SettingsController.php

@@ -24,6 +24,8 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCA\Impersonate\Events\BeginImpersonateEvent;
 
 class SettingsController extends Controller {
 	/** @var IUserManager */
@@ -40,27 +42,19 @@ class SettingsController extends Controller {
 	private $logger;
 	/** @var IL10N */
 	private $l;
+	/** @var IEventDispatcher */
+	private $eventDispatcher;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param ISession $session
-	 * @param IConfig $config
-	 * @param LoggerInterface $logger
-	 * @param IL10N $l
-	 */
-	public function __construct($appName,
+	public function __construct(string $appName,
 								IRequest $request,
 								IUserManager $userManager,
 								IGroupManager $groupManager,
 								IUserSession $userSession,
 								ISession $session,
 								IConfig $config,
 								LoggerInterface $logger,
-								IL10N $l) {
+								IL10N $l,
+								IEventDispatcher $eventDispatcher) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
@@ -69,29 +63,30 @@ public function __construct($appName,
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->l = $l;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
 	 * @UseSession
 	 * @NoAdminRequired
 	 */
 	public function impersonate(string $userId): JSONResponse {
-		/** @var IUser $currentUser */
-		$currentUser = $this->userSession->getUser();
+		/** @var IUser $impersonator */
+		$impersonator = $this->userSession->getUser();
 
 		$this->logger->warning(
 			sprintf(
 				'User %s trying to impersonate user %s',
-				$currentUser->getUID(),
+				$impersonator->getUID(),
 				$userId
 			),
 			[
 				'app' => 'impersonate',
 			]
 		);
 
-		$user = $this->userManager->get($userId);
-		if ($user === null) {
+		$impersonatee = $this->userManager->get($userId);
+		if ($impersonatee === null) {
 			return new JSONResponse(
 				[
 					'message' => $this->l->t('User not found'),
@@ -100,8 +95,8 @@ public function impersonate(string $userId): JSONResponse {
 			);
 		}
 
-		if (!$this->groupManager->isAdmin($currentUser->getUID())
-			&& !$this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $user)) {
+		if (!$this->groupManager->isAdmin($impersonator->getUID())
+			&& !$this->groupManager->getSubAdmin()->isUserAccessible($impersonator, $impersonatee)) {
 			return new JSONResponse(
 				[
 					'message' => $this->l->t('Insufficient permissions to impersonate user'),
@@ -112,7 +107,7 @@ public function impersonate(string $userId): JSONResponse {
 
 		$authorized = json_decode($this->config->getAppValue('impersonate', 'authorized', '["admin"]'));
 		if (!empty($authorized)) {
-			$userGroups = $this->groupManager->getUserGroupIds($currentUser);
+			$userGroups = $this->groupManager->getUserGroupIds($impersonator);
 
 			if (!array_intersect($userGroups, $authorized)) {
 				return new JSONResponse(
@@ -124,7 +119,7 @@ public function impersonate(string $userId): JSONResponse {
 			}
 		}
 
-		if ($user->getLastLogin() === 0) {
+		if ($impersonatee->getLastLogin() === 0) {
 			return new JSONResponse(
 				[
 					'message' => $this->l->t('Cannot impersonate the user because it was never logged in'),
@@ -133,7 +128,7 @@ public function impersonate(string $userId): JSONResponse {
 			);
 		}
 
-		if ($user->getUID() === $currentUser->getUID()) {
+		if ($impersonatee->getUID() === $impersonator->getUID()) {
 			return new JSONResponse(
 				[
 					'message' => $this->l->t('Cannot impersonate yourself'),
@@ -152,9 +147,12 @@ public function impersonate(string $userId): JSONResponse {
 			]
 		);
 		if ($this->session->get('oldUserId') === null) {
-			$this->session->set('oldUserId', $currentUser->getUID());
+			$this->session->set('oldUserId', $impersonator->getUID());
 		}
-		$this->userSession->setUser($user);
+
+		$this->eventDispatcher->dispatchTyped(new BeginImpersonateEvent($impersonator, $impersonatee));
+
+		$this->userSession->setUser($impersonatee);
 		return new JSONResponse();
 	}
 }

lib/Events/AImpersonateEvent.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 SnappyMail
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author the-djmaze
+ *
+ * @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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Impersonate\Events;
+
+use OCP\EventDispatcher\Event;
+use OCP\IUser;
+
+abstract class AImpersonateEvent extends Event {
+	private IUser $impersonator;
+
+	private IUser $impersonatee;
+
+	public function __construct(IUser $impersonator, IUser $impersonatee) {
+		parent::__construct();
+		$this->impersonator = $impersonator;
+		$this->impersonatee = $impersonatee;
+	}
+
+	public function getImpersonator(): IUser {
+		return $this->impersonator;
+	}
+
+	public function getImpersonatedUser(): IUser {
+		return $this->impersonatee;
+	}
+}

lib/Events/BeginImpersonateEvent.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Impersonate\Events;
+
+class BeginImpersonateEvent extends AImpersonateEvent {
+}

lib/Events/EndImpersonateEvent.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Impersonate\Events;
+
+class EndImpersonateEvent extends AImpersonateEvent {
+}

tests/phpunit.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="unit/bootstrap.php"
-		 strict="true"
 		 verbose="true"
 		 convertDeprecationsToExceptions="true"
 		 timeoutForSmallTests="900"
@@ -10,18 +9,5 @@
 	<testsuite name='Nextcloud - Impersonate App Tests'>
 		<directory suffix='Test.php'>.</directory>
 	</testsuite>
-	<!-- filters for code coverage -->
-	<filter>
-		<whitelist>
-			<directory suffix=".php">../../impersonate</directory>
-			<exclude>
-				<directory suffix=".php">../../impersonate/tests</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-	<logging>
-		<!-- and this is where your report will be written -->
-		<log type="coverage-clover" target="./clover.xml"/>
-	</logging>
 </phpunit>