diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2018-09-26 17:25:18 +0300 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2018-10-02 23:56:33 +0300 |
commit | 79a0ee4f4ae315b357f51dd35d3d3c6e60897ee1 (patch) | |
tree | 470d5bce819a22357fe820e515d82ca4d8339d64 /lib | |
parent | 6b730b4c478bc4f55a89fd7d6a7c2715e2e5b829 (diff) |
Consolidate personal two-factor provider settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib')
3 files changed, 138 insertions, 4 deletions
diff --git a/lib/private/Settings/Personal/Security.php b/lib/private/Settings/Personal/Security.php index efcfd5589ce..0efe2d0746b 100644 --- a/lib/private/Settings/Personal/Security.php +++ b/lib/private/Settings/Personal/Security.php @@ -24,18 +24,41 @@ namespace OC\Settings\Personal; +use function array_filter; +use function array_map; +use function is_null; +use OC\Authentication\TwoFactorAuth\Manager as TwoFactorManager; +use OC\Authentication\TwoFactorAuth\ProviderLoader; use OCP\AppFramework\Http\TemplateResponse; +use OCP\Authentication\TwoFactorAuth\IProvider; +use OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings; use OCP\IUserManager; +use OCP\IUserSession; use OCP\Settings\ISettings; class Security implements ISettings { + /** @var IUserManager */ private $userManager; - public function __construct( - IUserManager $userManager - ) { + /** @var TwoFactorManager */ + private $twoFactorManager; + + /** @var ProviderLoader */ + private $providerLoader; + + /** @var IUserSession */ + private $userSession; + + + public function __construct(IUserManager $userManager, + TwoFactorManager $providerManager, + ProviderLoader $providerLoader, + IUserSession $userSession) { $this->userManager = $userManager; + $this->twoFactorManager = $providerManager; + $this->providerLoader = $providerLoader; + $this->userSession = $userSession; } /** @@ -50,7 +73,8 @@ class Security implements ISettings { } return new TemplateResponse('settings', 'settings/personal/security', [ - 'passwordChangeSupported' => $passwordChangeSupported + 'passwordChangeSupported' => $passwordChangeSupported, + 'twoFactorProviderData' => $this->getTwoFactorProviderData(), ]); } @@ -73,4 +97,24 @@ class Security implements ISettings { public function getPriority() { return 10; } + + private function getTwoFactorProviderData(): array { + $user = $this->userSession->getUser(); + if (is_null($user)) { + // Actually impossible, but still … + return []; + } + + return [ + 'isEnabled' => $this->twoFactorManager->isTwoFactorAuthenticated($user), + 'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) { + return [ + 'provider' => $provider, + 'settings' => $provider->getPersonalSettings($user) + ]; + }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) { + return $provider instanceof IProvidesPersonalSettings; + })) + ]; + } } diff --git a/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php b/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php new file mode 100644 index 00000000000..80552d1fe8c --- /dev/null +++ b/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php @@ -0,0 +1,43 @@ +<?php + +declare(strict_types=1); + +/** + * @author Christoph Wurst <christoph@owncloud.com> + * + * @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 <http://www.gnu.org/licenses/>. + * + */ + +namespace OCP\Authentication\TwoFactorAuth; + +use OCP\Template; + +/** + * Interface IPersonalProviderSettings + * + * @since 15.0.0 + */ +interface IPersonalProviderSettings { + + /** + * @return Template + * + * @since 15.0.0 + */ + public function getBody(): Template; + +} diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php b/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php new file mode 100644 index 00000000000..5ba7ad547e9 --- /dev/null +++ b/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php @@ -0,0 +1,47 @@ +<?php + +declare(strict_types=1); + +/** + * @author Christoph Wurst <christoph@owncloud.com> + * + * @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 <http://www.gnu.org/licenses/>. + * + */ + +namespace OCP\Authentication\TwoFactorAuth; + +use OCP\IUser; + +/** + * Interface for admins that have personal settings. These settings will be shown in the + * security sections. Some information like the display name of the provider is read + * from the provider directly. + * + * @since 15.0.0 + */ +interface IProvidesPersonalSettings extends IProvider { + + /** + * @param IUser $user + * + * @return IPersonalProviderSettings + * + * @since 15.0.0 + */ + public function getPersonalSettings(IUser $user): IPersonalProviderSettings; + +} |