Commit 744ecf04 authored by olivier.salaun's avatar olivier.salaun
Browse files

[change] Use homogenous terminology for authentication.

Also use one-time tickets for web signoff now


git-svn-id: https://subversion.renater.fr/sympa/trunk@5193 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent f01a7a8b
......@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
AC_PREREQ(2.59)
AC_INIT(sympa, 6.0a.3, sympa-authors@cru.fr)
AC_INIT(sympa, 6.0a.4, sympa-authors@cru.fr)
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/home/sympa)
......
......@@ -4,7 +4,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%
[%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
[%|loc%]To subscribe just hit the following mailto url :[%END%]
[%|loc%]To subscribe just hit the following link :[%END%]
[% url %]
[%|loc(conf.sympa,subject)%]Or send a message to %1 with subject: "sub %2"[%END%]
......
......@@ -63,7 +63,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Subscription request to list %1[
[%|loc(list.name)-%]Dear owner of list %1,
A user asked to be added as a subscriber to your list. In order to list and manage
pending subscription requests you should click the following URL :[%END%]
pending subscription requests you should click on the following link :[%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
......@@ -86,7 +86,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]UNsubscription request from list
[%|loc(list.name)-%]Dear owner of list %1,
A user asked to be deleted from your list. If this is OK
with you, you should click the following URL :[% END %]
with you, you should click on the following link :[% END %]
[% FILTER escape_url %]mailto:[%sympa%]?subject=auth [%keyauth%] DEL [%list.name%] [%escaped_who%][% END %]
......
......@@ -16,7 +16,7 @@ Content-Transfer-Encoding: 8bit
[%- IF spam_status == 'spam' -%][%|loc%]This message has been tagged as spam[%END%][% END %]
[%|loc(mod_spool_size)%]They are %1 messages awaiting moderation.[%END%]
[%|loc(conf.wwsympa_url,one_time_ticket) %]You can browse and accept or refuse them by web : %1/ticket/%2[%END%]
[%|loc(conf.wwsympa_url,one_time_ticket) %]To browse the awaiting messages, you should click on the following link : %1/ticket/%2[%END%]
[% IF method == 'md5' -%]
[% IF request_topic -%][%|loc(list.name,conf.wwsympa_url,modkey)%]To tag the message in list %1 for the appropriate topic, please use the following link :
......
......@@ -11,7 +11,7 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
[% IF action == 'subrequest' -%]
[%|loc(list,conf.host,request_from_host,date)%]Someone, probably you, requested to subscribe to list %1@%2. (This request came from host %3 at %4).[%END%]
[%|loc%]You may ignore this subscription request or hit the following url in order to confirm it [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[%|loc%]You may ignore this subscription request or click on the following link in order to confirm it [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[% ELSIF action == 'sigrequest' -%]
[%|loc(list)%]You asked to be unsubscribed from %1 mailing list.[%END%]
......@@ -23,7 +23,7 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
[% ELSE -%]
[%|loc(conf.host,request_from_host,date)%]Someone, probably you, requested to allocate or renew your password for your list server account %1. (This request came from host %2 at %3).[%END%]
[%|loc%]You may ignore this request or hit the following url in order to choose your password. [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[%|loc%]You may ignore this request or click on the following link in order to choose your password. [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[%END%]
......
......@@ -43,6 +43,13 @@ Subject: [% FILTER qencode %][%|loc%]Changing your subscriber email address[%END
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% ELSIF type == 'ticket_to_signoff' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Unsubscribing from list %1[%END%][%END%]
[%|loc(list.name)%]You have requested to removed from list %1. To confirm and get removed from the list, please click the link below: [%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% ELSE -%]
Subject: [% FILTER qencode %][%list.name%] / [%type%][%END%]
......
<!-- $Id$ -->
[%|loc%]You will receive an email, with a confirmation ticket.[%END%]<br />
[%|loc%]To confirm your email address change, go to your email account and click on the ticket[%END%]
[%|loc%]You will receive a n email, with a confirmation link.[%END%]<br />
[%|loc%]To confirm your email address change, go to your email account and click on the provided link[%END%]
<!-- $Id: change_email_request.tt2 3907 2008-08-08 14:50:16Z peter.hart $ -->
[%|loc%]Changing your email address is a sensitive operation so we need to verify that it is really your email.[%END%]<br />
[%|loc(new_email)%]To this end we have sent you an email to this address : %1 with a confirmation ticket.[%END%]<br />
[%|loc%]To confirm your email address change, go to your email account and click on the ticket[%END%]
[%|loc%]Changing your email address is a sensitive operation so we need to verify your email.[%END%]<br />
[%|loc(new_email)%]To this end we have sent you an email to this address : %1 with a validation link.[%END%]<br />
[%|loc%]You shoukd check your mailbox now.[%END%]
......@@ -2,7 +2,7 @@
<div class="ContentBlock"> <strong>
[% IF last_login_date %]
[%|loc(last_login_host,last_login_date)%]last login from %1 (%2)[%END%]
[%|loc(last_login_host,last_login_date)%]last login from %1 (%2)[%END%]<br/>
[%END%]
[% FOREACH notice = notices %]
......
......@@ -10,7 +10,7 @@
[% ELSIF login_error == 'missing_password' %]
[%|loc%]You miss the password, please submit again. May be you forgot it ?[%END%]
[% ELSIF login_error == 'ticket_sent' %]
[%|loc%]You will receive an email in order to be able to choose your password.[%END%]
[%|loc%]You will receive an email that will allow you to choose your password.[%END%]
[% ELSE %]
[% IF requestpasswd_context == 'firstpasswd' %]
[%|loc%]In order to use Sympa, you will need to define a password.[%END%]
......
......@@ -3,15 +3,15 @@
[% IF login_error == 'ticket_sent' %]
<h3>[%|loc%]Message sent[%END%]</h3>
<p>
[%|loc%]The system sent you a message, please check your mailbox.[%END%]<br/>[%|loc%]Follow the URL contained within, it will lead you to a page in which you can choose your password.[%END%]
[%|loc%]We've sent you an email that will allow you choose your password. Please check your mailbox.[%END%]<br/>
</p>
[% ELSIF login_error == 'unable_to_send_ticket' %]
<p>
[%|loc%]The system was not able to send you the appropriate message.[%END%]
[%|loc%]We were not able to send you a validation message.[%END%]
</p>
[% ELSIF login_error == 'unable_to_create_ticket' %]
<p>
[%|loc%]Internal error : could not create a ticket, please contact the service administrator[%END%]
[%|loc%]Internal error : could not build a validation link, please contact the service administrator[%END%]
</p>
[% ELSE %]
<p>
......
<!-- $Id$ -->
[% IF status == 'auth' %]
[% IF status == 'user.email' %]
[%|loc(list)%]You asked to be unsubscribed from list %1[%END%]. <br />[%|loc%]To confirm
your request, please click the button below :[%END%]<br />
<br />
......@@ -21,31 +21,8 @@
Please contact the list owner to help you unsubscribe :[%END%]
<a href="mailto:[% list %]-request@[% conf.host %]">[% list %]-request@[% conf.host %]</a>
[% ELSIF init_passwd %]
[%|loc(list)%]You requested unsubscription from list %1[%END%].
<br /><br />
[%|loc%]To confirm your identity and prevent anyone from unsubscribing you from
this list against your will, a message containing an URL
will be sent to you.[%END%] <br /><br />
[%|loc(list)%]Check your mailbox for new messages and examine the message from Sympa to find your password.
Enter that password, below. This wil confirm your request to be unsubscribed from list %1.[%END%]
<form action="[% path_cgi %]" method="post">
<fieldset>
<strong>[%|loc%]e-mail address[%END%]</strong> [% email %]<br />
<strong><label for="passwd">[%|loc%]password[%END%]</label></strong>
<input id="passwd" type="password" name="passwd" size="20" />
<input type="hidden" name="list" value="[% list %]" />
<input type="hidden" name="email" value="[% email %]" />
&nbsp; &nbsp; &nbsp;<input class="MainMenuLinks" type="submit" name="action_signoff" value="[%|loc%]Unsubscribe[%END%]" />
</fieldset>
</form>
[%|loc%]This password, associated with your email address, will allow you to access your custom environment.[%END%]
[% ELSIF ! email %]
[%|loc(list)%]Please provide your email address for your unsubscription request from list %1.[%END%]
[%|loc(list)%]We need to check your identity before validating your unsubscription request for list %1. If you have a user account you should login or create an account. <br/>Otherwise we can send you an email with a validation link inside ; please provide your email address below to receive this validation link.[%END%]
<form action="[% path_cgi %]" method="post">
<fieldset>
......@@ -53,29 +30,15 @@
<input id="email" type="text" name="email"><br />
<input type="hidden" name="action" value="sigrequest" />
<input type="hidden" name="list" value="[% list %]" />
<input class="MainMenuLinks" type="submit" name="action_sigrequest" value="[%|loc%]Unsubscribe[%END%]" />
<input class="MainMenuLinks" type="submit" name="action_sigrequest" value="[%|loc%]Send me a validation link[%END%]" />
</fieldset>
</form>
[% ELSE %]
[%|loc(list)%]To confirm your unsubscription from list %1, please enter
your password below :[%END%]
[%|loc%]We've sent you an email including a validation link. You should check your mailbox to read this email and use this validation link.[%END%] <br /><br />
<form action="[% path_cgi %]" method="post">
<fieldset>
<strong>[%|loc%]e-mail address[%END%]</strong> [% email %]<br />
<strong><label for="passwd">[%|loc%]password[%END%]</label></strong>
<input id="passwd" type="password" name="passwd" size="20" />
<input type="hidden" name="list" value="[% list %]" />
<input type="hidden" name="email" value="[% email %]" />
&nbsp; &nbsp; &nbsp;<input class="MainMenuLinks" type="submit" name="action_signoff" value="[%|loc%]Unsubscribe[%END%]" />
<br /><br />
<em>[%|loc%]If you've never had a password from that server or if you don't remember it :[%END%]</em> <input class="MainMenuLinks" type="submit" name="action_sendpasswd" value="[%|loc%]Send me my password[%END%]" />
</fieldset>
</form>
[% END %]
......
......@@ -28,8 +28,8 @@
[%|loc(list)%]You requested a subscription to list %1[%END%].
<br /><br />
[%|loc%]To confirm your identity and prevent anyone from subscribing you to
this list against your will, a message containing an authentication URL was sent to the e-mail address you provided.[%END%] <br /><br />
[%|loc(list)%]Check your mailbox for new messages and click this URL. This will confirm your subscription to list %1.[%END%]
this list against your will, a message containing an validation link was sent to the e-mail address you provided.[%END%] <br /><br />
[%|loc(list)%]Check your mailbox for new messages and click this link. This will confirm your subscription to list %1.[%END%]
[% ELSIF status == 'notauth_noemail' %]
......
......@@ -2,24 +2,24 @@
[% IF ticket_context.date %]
[%|loc(ticket_context.printable_date) %]On %1 an authentication ticket was generated and sent to you. [%END%]
[%|loc(ticket_context.printable_date) %]A validation link was sent to you on %1. [%END%]
[% IF ticket_context.remote_addr %]
[%|loc(ticket_context.remote_addr) %](the ticket was requested from host %1) [%END%]
[%|loc(ticket_context.remote_addr) %](the validation link was requested from host %1) [%END%]
[%END%]
[%END%]
<h3>[%|loc%]reason[%END%]</h3>
[% IF ticket_context.result == 'closed' -%]
[%|loc(ticket_context.status)%]The validation ticket has already been validated from host %1 .If you did not perform this validation, please report this confidentiality issue to your mail services administrator.[%END%]
[%|loc(ticket_context.status)%]The validation link has already been validated from host %1 .If you did not perform this validation, please report this confidentiality issue to your mail services administrator.[%END%]
[%END%]
[% IF ticket_context.result == 'expired' -%]
[%|loc(ticket_context.printable_date)%]The requested ticket has expired[%END%].
[%|loc%]Please use your password or request a new ticket[%END%]
[%|loc(ticket_context.printable_date)%]The validation link has expired[%END%].
[%|loc%]Please login or request a new validation link[%END%]
[%END%]
[% IF ticket_context.result == 'not_found' -%]
[%|loc(ticket_context.printable_date)%]The requested authentication ticket has an unknow format or is expired[%END%].
[%|loc%]Please use your password or request a new ticket[%END%]
[%|loc(ticket_context.printable_date)%]The validation link has an unknow format or has expired[%END%].
[%|loc%]Please login or request a new validation link[%END%]
[%END%]
......
......@@ -402,7 +402,7 @@ sub create_one_time_ticket {
my $email = shift;
my $robot = shift;
my $data_string = shift;
my $remote_addr = shift;
my $remote_addr = shift; ## Value may be 'mail' if the IP address is not known
my $ticket = &SympaSession::get_random();
do_log('info', 'Auth::create_one_time_ticket(%s,%s,%s) value = %s',$email,$robot,$context_data,$ticket);
......
No preview for this file type
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment