summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2015-08-11 17:57:30 +0200
committerDylan William Hardison <dylan@hardison.net>2015-08-11 17:57:51 +0200
commit589ec37a32d8687d612eedd107748b7afadd07fd (patch)
tree2ce3f05091643ef199ff5648c4d0b3250def181b /template/en/default
parent99bec2e52b174c1e8774ebf12da5963330d47af9 (diff)
downloadbugzilla-589ec37a32d8687d612eedd107748b7afadd07fd.tar.gz
bugzilla-589ec37a32d8687d612eedd107748b7afadd07fd.tar.xz
Bug 1190693 - Backport bug 1175643 to bmo for safer auth delegation
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/user-error.html.tmpl9
1 files changed, 9 insertions, 0 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 4de3845d4..ffe1b6fa4 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -152,6 +152,15 @@
[% title = "Auth delegation can't be confirmed" %]
Auth delegation cannot be confirmed due to missing or invalid token.
+ [% ELSIF error == "auth_delegation_json_error" %]
+ [% title = "Auth delegation received invalid JSON" %]
+ Auth delegation received an invalid JSON response from auth consumer:
+ <pre>[% json_text FILTER html %]</pre>
+
+ [% ELSIF error == "auth_delegation_post_error" %]
+ [% title = "Auth delegation received invalid status code" %]
+ Auth delegation received an HTTP response other than 200 OK from auth consumer. Code: [% code FILTER html %]
+
[% ELSIF error == "auth_failure" %]
[% title = "Authorization Required" %]
[% admindocslinks = {'groups.html' => 'Group Security'} %]