From 681ce77bc0dc5828eae2bb48471db9e373437e4b Mon Sep 17 00:00:00 2001 From: "bbaetz%acm.org" <> Date: Sat, 22 Mar 2003 12:47:09 +0000 Subject: Bug 180642 - Move authentication code into a module r=gerv, justdave a=justdave --- .../en/default/account/auth/ldap-error.html.tmpl | 48 ++++++++ template/en/default/account/auth/login.html.tmpl | 104 +++++++++++++++++ template/en/default/account/login.html.tmpl | 124 --------------------- .../products/groupcontrol/confirm-edit.html.tmpl | 2 +- .../bug/process/confirm-duplicate.html.tmpl | 2 +- template/en/default/bug/process/midair.html.tmpl | 2 +- template/en/default/global/code-error.html.tmpl | 10 ++ .../en/default/global/confirm-user-match.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 11 +- 9 files changed, 172 insertions(+), 133 deletions(-) create mode 100644 template/en/default/account/auth/ldap-error.html.tmpl create mode 100644 template/en/default/account/auth/login.html.tmpl delete mode 100644 template/en/default/account/login.html.tmpl (limited to 'template/en/default') diff --git a/template/en/default/account/auth/ldap-error.html.tmpl b/template/en/default/account/auth/ldap-error.html.tmpl new file mode 100644 index 000000000..7615fb326 --- /dev/null +++ b/template/en/default/account/auth/ldap-error.html.tmpl @@ -0,0 +1,48 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Bradley Baetz + #%] + +[%# INTERFACE: + # auth_err_tag: string. The tag for the error + # info: hash. Additional variables which may be used when printing details + # of the error. + #%] + +[% SWITCH auth_err_tag %] + [% CASE "cannot_retreive_attr" %] + The specified LDAP attribute [% info.attr FILTER html %] was not found. + + [% CASE "connect_failed" %] + An error occurred while trying to connect to the LDAP server. + [% IF info.errstr %] + The error from the server was: [% info.errstr FILTER html %]. + [% END %] + + [% CASE "no_userid" %] + Bugzilla created a new account for you, but then could not find the + new userid. + + [% CASE "server_not_defined" %] + The LDAP server for authentication has not been defined. + + [% CASE %] + Unhandled authentication error: [% auth_err_tag FILTER html %] + +[% END %] diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl new file mode 100644 index 000000000..6dbd6531f --- /dev/null +++ b/template/en/default/account/auth/login.html.tmpl @@ -0,0 +1,104 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # target: string. URL to go to after login. + # form: hash; the form values which need to be submitted to the target script + # mform: hash; the form values with multiple values which need to be + # submitted to the target script + #%] + +[% PROCESS global/header.html.tmpl + title = "Login" +%] + +

+ I need a legitimate login and password to continue. +

+ +
+ + + + + + + + + [% IF Param('loginnetmask') < 32 %] + + + + + [% END %] + +
+ Login: + + +
+ Password: + + +
+ + Restrict this session
+ to this IP address: + + 		+ + (Using this option increases security) +
+ + [% PROCESS "global/hidden-fields.html.tmpl" + exclude="^Bugzilla_(login|password|restrictlogin)$" %] + + +
+ +[%# Allow the user to create a new account, or request a token to change + # their password, assuming that our auth method allows that. + #%] + +[% IF caneditaccount %] +
+ + [% IF Param("createemailregexp") %] +

+ If you don't have a Bugzilla account, you can + create a new account. +

+ [% END %] + +
+ + If you have an account, but have forgotten your password, + enter your login name below and submit a request + to change your password.
+ + +
+ +
+[% END %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/login.html.tmpl b/template/en/default/account/login.html.tmpl deleted file mode 100644 index 7d6e298d2..000000000 --- a/template/en/default/account/login.html.tmpl +++ /dev/null @@ -1,124 +0,0 @@ - -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - #%] - -[%# INTERFACE: - # target: string. URL to go to after login. - # form: hash; the form values which need to be submitted to the target script - # mform: hash; the form values with multiple values which need to be - # submitted to the target script - #%] - -[% PROCESS global/header.html.tmpl - title = "Login" -%] - -

- I need a legitimate - [% Param('useLDAP') ? "LDAP username" : "email address" %] - and password to continue. -

- -
- - - [% IF Param("useLDAP") %] - - - - - - - [% ELSE %] - - - - - - - [% END %] - [% IF Param('loginnetmask') < 32 %] - - - - - [% END %] - -
- Username: - - -
- Password: - - - - E-mail address: - - -
- Password: - - -
- - Restrict this session
- to this IP address: - - 		- - (Using this option increases security) -
- - [% PROCESS "global/hidden-fields.html.tmpl" - exclude="^(Bugzilla|LDAP)_(login|password)$" %] - - -
- -[%# Allow the user to create a new account, or request a token to change - # their password (unless we are using LDAP, in which case the user must - # use LDAP to change it). - #%] - -[% UNLESS Param("useLDAP") %] -
- - [% IF Param("createemailregexp") %] -

- If you don't have a Bugzilla account, you can - create a new account. -

- [% END %] - -
- - If you have an account, but have forgotten your password, - enter your login name below and submit a request - to change your password.
- - -
- -
-[% END %] - -[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index 85f89e6e8..cf8fcca9c 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -36,7 +36,7 @@ group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which th [% END %]
- [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
Click "Continue" to proceed with the change including the changes diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl index 22ae57b75..72472a83b 100644 --- a/template/en/default/bug/process/confirm-duplicate.html.tmpl +++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl @@ -52,7 +52,7 @@ -[% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] +[% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]

diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 85a5c1fff..e3698a640 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -65,7 +65,7 @@ You have the following choices:

  • - [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] This will cause all of the above changes to be overwritten [% ", except for the added comment(s)" IF comments.size > start_at %]. diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a29cb1e1c..b35bbb064 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -48,6 +48,16 @@ Attachment #[% attachid FILTER html %] ([% description FILTER html %]) is already obsolete. + [% ELSIF error == "auth_err" %] + [% title = "Internal Authentication Error" %] + [%# Authentication errors are in a template depending on the auth method, + for pluggability. + #%] + [% INCLUDE "account/auth/$authmethod-error.html.tmpl" %] + + [% ELSIF error == "authres_unhandled" %] + An authorization handler return value was not handled by the login code. + [% ELSIF error == "bug_error" %] Trying to retrieve bug [% bug.bug_id %] returned the error [% bug.error FILTER html %] diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 92fa47a53..037f7385c 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -155,7 +155,7 @@ [% IF matchsuccess == 1 %] - [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]

    diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 89f8cb7f3..11899fe70 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -92,6 +92,12 @@ Bug aliases cannot be longer than 20 characters. Please choose a shorter alias. + [% ELSIF error == "auth_cant_create_account" %] + [% title = "Can't create accounts" %] + This site is using an authentication scheme which does not permit + account creation. Please contact an administrator to get a new account + created. + [% ELSIF error == "authorization_failure" %] [% title = "Authorization Failed" %] You are not allowed to [% action %]. @@ -312,11 +318,6 @@ [% ELSIF error == "invalid_username_or_password" %] [% title = "Invalid Username Or Password" %] The username or password you entered is not valid. - - [% ELSIF error == "ldap_cant_create_account" %] - [% title = "Can't create LDAP accounts" %] - This site is using LDAP for authentication. Please contact - an LDAP administrator to get a new account created. [% ELSIF error == "login_needed_for_password_change" %] [% title = "Login Name Required" %] -- cgit v1.2.3-24-g4f1b