diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-09-19 17:46:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 17:46:25 +0200 |
| commit | 5abefb689bc17dc26e747164f9251926faade358 (patch) | |
| tree | 9675fb0d20e51c5a908eb99cef8af62407b7d1e8 /Bugzilla.pm | |
| parent | 251dcb33528c771dcb7e6793b6611aa2436f4bbe (diff) | |
| download | bugzilla-5abefb689bc17dc26e747164f9251926faade358.tar.gz bugzilla-5abefb689bc17dc26e747164f9251926faade358.tar.xz | |
Bug 1400419 - Direct GitHub-auth'd users that are required to use 2FA to issue a password reset
Diffstat (limited to 'Bugzilla.pm')
| -rw-r--r-- | Bugzilla.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index 96eff5df2..9234243f7 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -407,13 +407,14 @@ sub login { my $grace_period = Bugzilla->params->{mfa_group_grace_period}; my $expired = defined $date && $date < DateTime->now; my $on_mfa_page = $cgi->script_name eq '/userprefs.cgi' && $cgi->param('tab') eq 'mfa'; + my $on_token_page = $cgi->script_name eq '/token.cgi'; Bugzilla->request_cache->{mfa_warning} = 1; Bugzilla->request_cache->{mfa_grace_period_expired} = $expired; Bugzilla->request_cache->{on_mfa_page} = $on_mfa_page; if ( $grace_period == 0 || $expired) { - if (!$on_mfa_page) { + if ( !( $on_mfa_page || $on_token_page ) ) { print Bugzilla->cgi->redirect("userprefs.cgi?tab=mfa"); exit; } |