summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-03-18 07:28:27 +0100
committerByron Jones <bjones@mozilla.com>2013-03-18 07:28:27 +0100
commite96f9044a310649cf67791c13df34bc3f9bced41 (patch)
tree96087811d294a7abc2a6d3a9eb8d12221465dc5e /extensions
parent57201f3bfb5dfee4ffe8d55e6906bb64d2571d6e (diff)
downloadbugzilla-e96f9044a310649cf67791c13df34bc3f9bced41.tar.gz
bugzilla-e96f9044a310649cf67791c13df34bc3f9bced41.tar.xz
Bug 852026: improve persona's error management
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Persona/lib/Login.pm50
-rw-r--r--extensions/Persona/template/en/default/hook/global/user-error-errors.html.tmpl18
2 files changed, 41 insertions, 27 deletions
diff --git a/extensions/Persona/lib/Login.pm b/extensions/Persona/lib/Login.pm
index 167cc799f..62fca4d50 100644
--- a/extensions/Persona/lib/Login.pm
+++ b/extensions/Persona/lib/Login.pm
@@ -38,21 +38,36 @@ sub get_login_info {
my $token = $cgi->param("token");
$cgi->delete('token');
check_hash_token($token, ['login']);
-
+
my $urlbase = new URI(correct_urlbase());
my $audience = $urlbase->scheme . "://" . $urlbase->host_port;
- my $ua = new LWP::UserAgent();
+ my $ua = new LWP::UserAgent( timeout => 10 );
- my $info = { 'status' => 'persona-server-broken' };
- eval {
- my $response = $ua->post(Bugzilla->params->{persona_verify_url},
- [assertion => $assertion,
- audience => $audience]);
+ my $response = $ua->post(Bugzilla->params->{persona_verify_url},
+ [ assertion => $assertion,
+ audience => $audience ]);
+ if ($response->is_error) {
+ return { failure => AUTH_ERROR,
+ user_error => 'persona_server_fail',
+ details => { reason => $response->message }};
+ }
- $info = decode_json($response->content());
+ my $info;
+ eval {
+ $info = decode_json($response->decoded_content());
};
-
+ if ($@) {
+ return { failure => AUTH_ERROR,
+ user_error => 'persona_server_fail',
+ details => { reason => 'Received a malformed response.' }};
+ }
+ if ($info->{'status'} eq 'failure') {
+ return { failure => AUTH_ERROR,
+ user_error => 'persona_server_fail',
+ details => { reason => $info->{reason} }};
+ }
+
if ($info->{'status'} eq "okay" &&
$info->{'audience'} eq $audience &&
($info->{'expires'} / 1000) > time())
@@ -61,10 +76,9 @@ sub get_login_info {
'username' => $info->{'email'}
};
- my $result =
- Bugzilla::Auth::Verify->create_or_update_user($login_data);
+ my $result = Bugzilla::Auth::Verify->create_or_update_user($login_data);
return $result if $result->{'failure'};
-
+
my $user = $result->{'user'};
# You can restrict people in a particular group from logging in using
@@ -74,17 +88,16 @@ sub get_login_info {
# If you have your "createemailregexp" set up in such a way that a
# newly-created account is a member of "no-browser-id", this code will
# create an account for them and then fail their login. Which isn't
- # great, but they can still use normal-Bugzilla-login password
+ # great, but they can still use normal-Bugzilla-login password
# recovery.
if ($user->in_group('no-browser-id')) {
- # We use a custom error here, for greater clarity, rather than
- # returning a failure code.
- ThrowUserError('persona_account_too_powerful');
+ return { failure => AUTH_ERROR,
+ user_error => 'persona_account_too_powerful' };
}
$login_data->{'user'} = $user;
$login_data->{'user_id'} = $user->id;
-
+
return $login_data;
}
else {
@@ -103,8 +116,7 @@ sub fail_nodata {
}
print $cgi->header();
- $template->process("account/auth/login.html.tmpl",
- { 'target' => $cgi->url(-relative=>1) })
+ $template->process("account/auth/login.html.tmpl", { 'target' => $cgi->url(-relative=>1) })
|| ThrowTemplateError($template->error());
exit;
}
diff --git a/extensions/Persona/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Persona/template/en/default/hook/global/user-error-errors.html.tmpl
index bf7b865ac..f2e5bda24 100644
--- a/extensions/Persona/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Persona/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -1,10 +1,12 @@
[% IF error == "persona_account_too_powerful" %]
- [% title = "Account Too Powerful" %]
- Your account is a member of a group which is not permitted to use
- Persona to log in. Please log in with your [% terms.Bugzilla %] username
- and password.
- <br><br>
- (Persona logins are disabled for accounts which are members of certain
- particularly sensitive groups, while we gain experience with the
- technology.)
+ [% title = "Account Too Powerful" %]
+ Your account is a member of a group which is not permitted to use Persona to
+ log in. Please log in with your [% terms.Bugzilla %] username and password.
+ <br><br>
+ (Persona logins are disabled for accounts which are members of certain
+ particularly sensitive groups, while we gain experience with the technology.)
+[% ELSIF error == "persona_server_fail" %]
+ An error occurred during communication with the Persona servers:
+ <br>
+ [% reason FILTER html %]
[% END %]