diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/TwoFactorChallengeController.php | 25 | ||||
| -rw-r--r-- | core/templates/twofactorshowchallenge.php | 8 |
2 files changed, 26 insertions, 7 deletions
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index 34f0092bea8..fd4811d3ff6 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -29,6 +29,7 @@ use OC_Util; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\Authentication\TwoFactorAuth\TwoFactorException; use OCP\IRequest; use OCP\ISession; use OCP\IURLGenerator; @@ -115,16 +116,19 @@ class TwoFactorChallengeController extends Controller { $backupProvider = null; } + $errorMessage = ''; + $error = false; if ($this->session->exists('two_factor_auth_error')) { $this->session->remove('two_factor_auth_error'); $error = true; - } else { - $error = false; + $errorMessage = $this->session->get("two_factor_auth_error_message"); + $this->session->remove('two_factor_auth_error_message'); } $tmpl = $provider->getTemplate($user); $tmpl->assign('redirect_url', $redirect_url); $data = [ 'error' => $error, + 'error_message' => $errorMessage, 'provider' => $provider, 'backupProvider' => $backupProvider, 'logout_attribute' => $this->getLogoutAttribute(), @@ -151,11 +155,20 @@ class TwoFactorChallengeController extends Controller { return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge')); } - if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) { - if (!is_null($redirect_url)) { - return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url))); + try { + if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) { + if (!is_null($redirect_url)) { + return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url))); + } + return new RedirectResponse(OC_Util::getDefaultPageUrl()); } - return new RedirectResponse(OC_Util::getDefaultPageUrl()); + } catch (TwoFactorException $e) { + /* + * The 2FA App threw an TwoFactorException. Now we display more + * information to the user. The exception text is stored in the + * session to be used in showChallenge() + */ + $this->session->set('two_factor_auth_error_message', $e->getMessage()); } $this->session->set('two_factor_auth_error', true); diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php index 20b92be9520..4f3741b5dfe 100644 --- a/core/templates/twofactorshowchallenge.php +++ b/core/templates/twofactorshowchallenge.php @@ -3,6 +3,8 @@ /** @var $_ array */ /* @var $error boolean */ $error = $_['error']; +/* @var $error_message string */ +$error_message = $_['error_message']; /* @var $provider OCP\Authentication\TwoFactorAuth\IProvider */ $provider = $_['provider']; /* @var $template string */ @@ -12,7 +14,11 @@ $template = $_['template']; <div class="warning"> <h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2> <?php if ($error): ?> - <p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p> + <?php if($error_message): ?> + <p><strong><?php p($error_message); ?></strong></p> + <?php else: ?> + <p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p> + <?php endif; ?> <?php endif; ?> <?php print_unescaped($template); ?> </div> |