From b67e488236170dfe56a2122db84369ba6b77f706 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 26 Jun 2022 10:13:32 +0200 Subject: [PATCH] adaptions --- .../TwoFactor/{Signout.php => SignOut.php} | 16 ++++++------ src/Module/Settings/TwoFactor/Index.php | 25 +++++++++++-------- static/routes.config.php | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) rename src/Module/Security/TwoFactor/{Signout.php => SignOut.php} (87%) diff --git a/src/Module/Security/TwoFactor/Signout.php b/src/Module/Security/TwoFactor/SignOut.php similarity index 87% rename from src/Module/Security/TwoFactor/Signout.php rename to src/Module/Security/TwoFactor/SignOut.php index 3e52b27e71..20b7f039d6 100644 --- a/src/Module/Security/TwoFactor/Signout.php +++ b/src/Module/Security/TwoFactor/SignOut.php @@ -38,7 +38,7 @@ use Psr\Log\LoggerInterface; * * @package Friendica\Module\TwoFactor */ -class Signout extends BaseModule +class SignOut extends BaseModule { protected $errors = []; @@ -47,15 +47,15 @@ class Signout extends BaseModule /** @var Cookie */ protected $cookie; /** @var TwoFactor\Repository\TrustedBrowser */ - protected $trustedBrowserRepositoy; + protected $trustedBrowserRepository; - public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, IHandleSessions $session, Cookie $cookie, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepositoy, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, IHandleSessions $session, Cookie $cookie, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepository, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->session = $session; - $this->cookie = $cookie; - $this->trustedBrowserRepositoy = $trustedBrowserRepositoy; + $this->session = $session; + $this->cookie = $cookie; + $this->trustedBrowserRepository = $trustedBrowserRepository; } protected function post(array $request = []) @@ -79,7 +79,7 @@ class Signout extends BaseModule $this->baseUrl->redirect(); break; case 'sign_out': - $this->trustedBrowserRepositoy->removeForUser(local_user(), $this->cookie->get('2fa_cookie_hash')); + $this->trustedBrowserRepository->removeForUser(local_user(), $this->cookie->get('2fa_cookie_hash')); $this->cookie->clear(); $this->session->clear(); @@ -99,7 +99,7 @@ class Signout extends BaseModule } try { - $trustedBrowser = $this->trustedBrowserRepositoy->selectOneByHash($this->cookie->get('2fa_cookie_hash')); + $trustedBrowser = $this->trustedBrowserRepository->selectOneByHash($this->cookie->get('2fa_cookie_hash')); if (!$trustedBrowser->trusted) { $trusted = $this->cookie->get('2fa_cookie_hash'); $this->cookie->reset(['2fa_cookie_hash' => $trusted]); diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php index 98826824b9..0da49f3177 100644 --- a/src/Module/Settings/TwoFactor/Index.php +++ b/src/Module/Settings/TwoFactor/Index.php @@ -45,8 +45,8 @@ class Index extends BaseSettings try { User::getIdFromPasswordAuthentication(local_user(), $_POST['password'] ?? ''); - $has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret'); - $verified = DI::pConfig()->get(local_user(), '2fa', 'verified'); + $has_secret = (bool)DI::pConfig()->get(local_user(), '2fa', 'secret'); + $verified = DI::pConfig()->get(local_user(), '2fa', 'verified'); switch ($_POST['action'] ?? '') { case 'enable': @@ -55,7 +55,8 @@ class Index extends BaseSettings DI::pConfig()->set(local_user(), '2fa', 'secret', $Google2FA->generateSecretKey(32)); - DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password')); + DI::baseUrl() + ->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password')); } break; case 'disable': @@ -71,29 +72,33 @@ class Index extends BaseSettings break; case 'recovery': if ($has_secret) { - DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password')); + DI::baseUrl() + ->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password')); } break; case 'app_specific': if ($has_secret) { - DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); + DI::baseUrl() + ->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); } break; case 'trusted': if ($has_secret) { - DI::baseUrl()->redirect('settings/2fa/trusted?t=' . self::getFormSecurityToken('settings_2fa_password')); + DI::baseUrl() + ->redirect('settings/2fa/trusted?t=' . self::getFormSecurityToken('settings_2fa_password')); } break; case 'configure': if (!$verified) { - DI::baseUrl()->redirect('settings/2fa/verify?t=' . self::getFormSecurityToken('settings_2fa_password')); + DI::baseUrl() + ->redirect('settings/2fa/verify?t=' . self::getFormSecurityToken('settings_2fa_password')); } break; } + } catch (FoundException $exception) { + // Nothing to do here } catch (\Exception $e) { - if (!($e instanceof FoundException)) { - notice(DI::l10n()->t($e->getMessage())); - } + notice(DI::l10n()->t($e->getMessage())); } } diff --git a/static/routes.config.php b/static/routes.config.php index 9c82c8e1f1..dac56a1255 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -166,7 +166,7 @@ return [ '[/]' => [Module\Security\TwoFactor\Verify::class, [R::GET, R::POST]], '/recovery' => [Module\Security\TwoFactor\Recovery::class, [R::GET, R::POST]], '/trust' => [Module\Security\TwoFactor\Trust::class, [R::GET, R::POST]], - '/signout' => [Module\Security\TwoFactor\Signout::class, [R::GET, R::POST]], + '/signout' => [Module\Security\TwoFactor\SignOut::class, [R::GET, R::POST]], ], '/api' => [ -- 2.39.5