From cd79eb1b2ce70876a496e071af90bd601d8ddcd1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 15 May 2017 13:19:44 +0200 Subject: [PATCH] Remove 2FA backup codes on user deletion Signed-off-by: Joas Schilling --- apps/twofactor_backupcodes/appinfo/app.php | 10 +-- .../lib/AppInfo/Application.php | 62 +++++++++++++++++++ .../lib/Db/BackupCodeMapper.php | 12 +++- 3 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 apps/twofactor_backupcodes/lib/AppInfo/Application.php diff --git a/apps/twofactor_backupcodes/appinfo/app.php b/apps/twofactor_backupcodes/appinfo/app.php index 0cb10531360..34b4866af2d 100644 --- a/apps/twofactor_backupcodes/appinfo/app.php +++ b/apps/twofactor_backupcodes/appinfo/app.php @@ -1,7 +1,8 @@ + * @copyright Copyright (c) 2017 Joas Schilling + * + * @author Joas Schilling * * @license GNU AGPL version 3 or any later version * @@ -20,6 +21,5 @@ * */ -// @codeCoverageIgnoreStart -OC_App::registerPersonal('twofactor_backupcodes', 'settings/personal'); -// @codeCoverageIgnoreEnd +$app = new \OCA\TwoFactorBackupCodes\AppInfo\Application(); +$app->register(); diff --git a/apps/twofactor_backupcodes/lib/AppInfo/Application.php b/apps/twofactor_backupcodes/lib/AppInfo/Application.php new file mode 100644 index 00000000000..ad92c0b1476 --- /dev/null +++ b/apps/twofactor_backupcodes/lib/AppInfo/Application.php @@ -0,0 +1,62 @@ + + * + * @author Joas Schilling + * + * @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\TwoFactorBackupCodes\AppInfo; + +use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper; +use OCP\AppFramework\App; +use OCP\Util; + +class Application extends App { + public function __construct () { + parent::__construct('twofactor_backupcodes'); + } + + /** + * Register the different app parts + */ + public function register() { + $this->registerHooksAndEvents(); + $this->registerPersonalPage(); + } + + /** + * Register the hooks and events + */ + public function registerHooksAndEvents() { + Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser'); + } + + public function deleteUser($params) { + /** @var BackupCodeMapper $mapper */ + $mapper = $this->getContainer()->query(BackupCodeMapper::class); + $mapper->deleteCodesByUserId($params['uid']); + } + + /** + * Register personal settings for notifications and emails + */ + public function registerPersonalPage() { + \OCP\App::registerPersonal($this->getContainer()->getAppName(), 'settings/personal'); + } +} diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php index 85cc174fb6a..ff993683c59 100644 --- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php +++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php @@ -52,12 +52,22 @@ class BackupCodeMapper extends Mapper { }, $rows); } + /** + * @param IUser $user + */ public function deleteCodes(IUser $user) { + $this->deleteCodesByUserId($user->getUID()); + } + + /** + * @param string $uid + */ + public function deleteCodesByUserId($uid) { /* @var IQueryBuilder $qb */ $qb = $this->db->getQueryBuilder(); $qb->delete('twofactor_backup_codes') - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID()))); + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid))); $qb->execute(); } -- 2.39.5