jro_apps/redmine Commit - r13506:a3a8fee8adf8

Send password reset email to the email used in lost password form (#4244)....

Jean-Philippe Lang -

r13506:a3a8fee8adf8

parent child

Context file:

r13506:a3a8fee8adf8

Collapse all files

app/controllers/account_controller.rb +5 -2

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :check_password_change
               # Overrides ApplicationController#verify_authenticity_token to disable
               # token verification on openid callbacks
               def verify_authenticity_token
                 unless using_open_id?
                   super
                 end
               end
               # Login request and validation
               def login
                 if request.get?
                   if User.current.logged?
                     redirect_back_or_default home_url, :referer => true
                   end
                 else
                   authenticate_user
                 end
               rescue AuthSourceException => e
                 logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
                 render_error :message => e.message
               end
               # Log out current user and redirect to welcome page
               def logout
                 if User.current.anonymous?
                   redirect_to home_url
                 elsif request.post?
                   logout_user
                   redirect_to home_url
                 end
                 # display the logout form
               end
               # Lets user choose a new password
               def lost_password
                 (redirect_to(home_url); return) unless Setting.lost_password?
                 if params[:token]
                   @token = Token.find_token("recovery", params[:token].to_s)
                   if @token.nil? || @token.expired?
                     redirect_to home_url
                     return
                   end
                   @user = @token.user
                   unless @user && @user.active?
                     redirect_to home_url
                     return
                   end
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to signin_path
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
-                    user = User.find_by_mail(params[:mail].to_s)
+                    email = params[:mail].to_s
+                    user = User.find_by_mail(email)
                     # user not found
                     unless user
                       flash.now[:error] = l(:notice_account_unknown_email)
                       return
                     end
                     unless user.active?
                       handle_inactive_user(user, lost_password_path)
                       return
                     end
                     # user cannot change its password
                     unless user.change_password_allowed?
                       flash.now[:error] = l(:notice_can_t_change_password)
                       return
                     end
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
-                      Mailer.lost_password(token).deliver
+                      # Don't use the param to send the email
+                      recipent = user.mails.detect {|e| e.downcase == email.downcase} || user.mail
+                      Mailer.lost_password(token, recipent).deliver
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to signin_path
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
                 if request.get?
                   session[:auth_source_registration] = nil
                   @user = User.new(:language => current_language.to_s)
                 else
                   user_params = params[:user] || {}
                   @user = User.new
                   @user.safe_attributes = user_params
                   @user.admin = false
                   @user.register
                   if session[:auth_source_registration]
                     @user.activate
                     @user.login = session[:auth_source_registration][:login]
                     @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
                     if @user.save
                       session[:auth_source_registration] = nil
                       self.logged_user = @user
                       flash[:notice] = l(:notice_account_activated)
                       redirect_to my_account_path
                     end
                   else
                     @user.login = params[:user][:login]
                     unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
                       @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
                     end
                     case Setting.self_registration
                     when '1'
                       register_by_email_activation(@user)
                     when '3'
                       register_automatically(@user)
                     else
                       register_manually_by_administrator(@user)
                     end
                   end
                 end
               end
               # Token based account activation
               def activate
                 (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?
                 token = Token.find_token('register', params[:token].to_s)
                 (redirect_to(home_url); return) unless token and !token.expired?
                 user = token.user
                 (redirect_to(home_url); return) unless user.registered?
                 user.activate
                 if user.save
                   token.destroy
                   flash[:notice] = l(:notice_account_activated)
                 end
                 redirect_to signin_path
               end
               # Sends a new account activation email
               def activation_email
                 if session[:registered_user_id] && Setting.self_registration == '1'
                   user_id = session.delete(:registered_user_id).to_i
                   user = User.find_by_id(user_id)
                   if user && user.registered?
                     register_by_email_activation(user)
                     return
                   end
                 end
                 redirect_to(home_url)
               end
               private
               def authenticate_user
                 if Setting.openid? && using_open_id?
                   open_id_authenticate(params[:openid_url])
                 else
                   password_authentication
                 end
               end
               def password_authentication
                 user = User.try_to_login(params[:username], params[:password], false)
                 if user.nil?
                   invalid_credentials
                 elsif user.new_record?
                   onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
                 else
                   # Valid user
                   if user.active?
                     successful_authentication(user)
                   else
                     handle_inactive_user(user)
                   end
                 end
               end
               def open_id_authenticate(openid_url)
                 back_url = signin_url(:autologin => params[:autologin])
                 authenticate_with_open_id(
                       openid_url, :required => [:nickname, :fullname, :email],
                       :return_to => back_url, :method => :post
                 ) do |result, identity_url, registration|
                   if result.successful?
                     user = User.find_or_initialize_by_identity_url(identity_url)
                     if user.new_record?
                       # Self-registration off
                       (redirect_to(home_url); return) unless Setting.self_registration?
                       # Create on the fly
                       user.login = registration['nickname'] unless registration['nickname'].nil?
                       user.mail = registration['email'] unless registration['email'].nil?
                       user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
                       user.random_password
                       user.register
                       case Setting.self_registration
                       when '1'
                         register_by_email_activation(user) do
                           onthefly_creation_failed(user)
                         end
                       when '3'
                         register_automatically(user) do
                           onthefly_creation_failed(user)
                         end
                       else
                         register_manually_by_administrator(user) do
                           onthefly_creation_failed(user)
                         end
                       end
                     else
                       # Existing record
                       if user.active?
                         successful_authentication(user)
                       else
                         handle_inactive_user(user)
                       end
                     end
                   end
                 end
               end
               def successful_authentication(user)
                 logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
                 # Valid user
                 self.logged_user = user
                 # generate a key and set cookie if autologin
                 if params[:autologin] && Setting.autologin?
                   set_autologin_cookie(user)
                 end
                 call_hook(:controller_account_success_authentication_after, {:user => user })
                 redirect_back_or_default my_page_path
               end
               def set_autologin_cookie(user)
                 token = Token.create(:user => user, :action => 'autologin')
                 cookie_options = {
                   :value => token.value,
                   :expires => 1.year.from_now,
                   :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
                   :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
                   :httponly => true
                 }
                 cookies[autologin_cookie_name] = cookie_options
               end
               # Onthefly creation failed, display the registration form to fill/fix attributes
               def onthefly_creation_failed(user, auth_source_options = { })
                 @user = user
                 session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
                 render :action => 'register'
               end
               def invalid_credentials
                 logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
                 flash.now[:error] = l(:notice_account_invalid_creditentials)
               end
               # Register a user for email activation.
               #
               # Pass a block for behavior when a user fails to save
               def register_by_email_activation(user, &block)
                 token = Token.new(:user => user, :action => "register")
                 if user.save and token.save
                   Mailer.register(token).deliver
                   flash[:notice] = l(:notice_account_register_done, :email => user.mail)
                   redirect_to signin_path
                 else
                   yield if block_given?
                 end
               end
               # Automatically register a user
               #
               # Pass a block for behavior when a user fails to save
               def register_automatically(user, &block)
                 # Automatic activation
                 user.activate
                 user.last_login_on = Time.now
                 if user.save
                   self.logged_user = user
                   flash[:notice] = l(:notice_account_activated)
                   redirect_to my_account_path
                 else
                   yield if block_given?
                 end
               end
               # Manual activation by the administrator
               #
               # Pass a block for behavior when a user fails to save
               def register_manually_by_administrator(user, &block)
                 if user.save
                   # Sends an email to the administrators
                   Mailer.account_activation_request(user).deliver
                   account_pending(user)
                 else
                   yield if block_given?
                 end
               end
               def handle_inactive_user(user, redirect_path=signin_path)
                 if user.registered?
                   account_pending(user, redirect_path)
                 else
                   account_locked(user, redirect_path)
                 end
               end
               def account_pending(user, redirect_path=signin_path)
                 if Setting.self_registration == '1'
                   flash[:error] = l(:notice_account_not_activated_yet, :url => activation_email_path)
                   session[:registered_user_id] = user.id
                 else
                   flash[:error] = l(:notice_account_pending)
                 end
                 redirect_to redirect_path
               end
               def account_locked(user, redirect_path=signin_path)
                 flash[:error] = l(:notice_account_locked)
                 redirect_to redirect_path
               end
             end

app/models/mailer.rb +3 -2

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Mailer < ActionMailer::Base
               layout 'mailer'
               helper :application
               helper :issues
               helper :custom_fields
               include Redmine::I18n
               def self.default_url_options
                 { :host => Setting.host_name, :protocol => Setting.protocol }
               end
               # Builds a mail for notifying to_users and cc_users about a new issue
               def issue_add(issue, to_users, cc_users)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id issue
                 references issue
                 @author = issue.author
                 @issue = issue
                 @users = to_users + cc_users
                 @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue)
                 mail :to => to_users,
                   :cc => cc_users,
                   :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
               end
               # Notifies users about a new issue
               def self.deliver_issue_add(issue)
                 to = issue.notified_users
                 cc = issue.notified_watchers - to
                 issue.each_notification(to + cc) do |users|
                   Mailer.issue_add(issue, to & users, cc & users).deliver
                 end
               end
               # Builds a mail for notifying to_users and cc_users about an issue update
               def issue_edit(journal, to_users, cc_users)
                 issue = journal.journalized
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id journal
                 references issue
                 @author = journal.user
                 s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
                 s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
                 s << issue.subject
                 @issue = issue
                 @users = to_users + cc_users
                 @journal = journal
                 @journal_details = journal.visible_details(@users.first)
                 @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
                 mail :to => to_users,
                   :cc => cc_users,
                   :subject => s
               end
               # Notifies users about an issue update
               def self.deliver_issue_edit(journal)
                 issue = journal.journalized.reload
                 to = journal.notified_users
                 cc = journal.notified_watchers - to
                 journal.each_notification(to + cc) do |users|
                   issue.each_notification(users) do |users2|
                     Mailer.issue_edit(journal, to & users2, cc & users2).deliver
                   end
                 end
               end
               def reminder(user, issues, days)
                 set_language_if_valid user.language
                 @issues = issues
                 @days = days
                 @issues_url = url_for(:controller => 'issues', :action => 'index',
                                             :set_filter => 1, :assigned_to_id => user.id,
                                             :sort => 'due_date:asc')
                 mail :to => user,
                   :subject => l(:mail_subject_reminder, :count => issues.size, :days => days)
               end
               # Builds a Mail::Message object used to email users belonging to the added document's project.
               #
               # Example:
               #   document_added(document) => Mail::Message object
               #   Mailer.document_added(document).deliver => sends an email to the document's project recipients
               def document_added(document)
                 redmine_headers 'Project' => document.project.identifier
                 @author = User.current
                 @document = document
                 @document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
                 mail :to => document.notified_users,
                   :subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
               end
               # Builds a Mail::Message object used to email recipients of a project when an attachements are added.
               #
               # Example:
               #   attachments_added(attachments) => Mail::Message object
               #   Mailer.attachments_added(attachments).deliver => sends an email to the project's recipients
               def attachments_added(attachments)
                 container = attachments.first.container
                 added_to = ''
                 added_to_url = ''
                 @author = attachments.first.author
                 case container.class.name
                 when 'Project'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
                   added_to = "#{l(:label_project)}: #{container}"
                   recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
                 when 'Version'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
                   added_to = "#{l(:label_version)}: #{container.name}"
                   recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
                   recipients = container.notified_users
                 end
                 redmine_headers 'Project' => container.project.identifier
                 @attachments = attachments
                 @added_to = added_to
                 @added_to_url = added_to_url
                 mail :to => recipients,
                   :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
               end
               # Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
               #
               # Example:
               #   news_added(news) => Mail::Message object
               #   Mailer.news_added(news).deliver => sends an email to the news' project recipients
               def news_added(news)
                 redmine_headers 'Project' => news.project.identifier
                 @author = news.author
                 message_id news
                 references news
                 @news = news
                 @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
                 mail :to => news.notified_users,
                   :cc => news.notified_watchers_for_added_news,
                   :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
               end
               # Builds a Mail::Message object used to email recipients of a news' project when a news comment is added.
               #
               # Example:
               #   news_comment_added(comment) => Mail::Message object
               #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
               def news_comment_added(comment)
                 news = comment.commented
                 redmine_headers 'Project' => news.project.identifier
                 @author = comment.author
                 message_id comment
                 references news
                 @news = news
                 @comment = comment
                 @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
                 mail :to => news.notified_users,
                  :cc => news.notified_watchers,
                  :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
               end
               # Builds a Mail::Message object used to email the recipients of the specified message that was posted.
               #
               # Example:
               #   message_posted(message) => Mail::Message object
               #   Mailer.message_posted(message).deliver => sends an email to the recipients
               def message_posted(message)
                 redmine_headers 'Project' => message.project.identifier,
                                 'Topic-Id' => (message.parent_id || message.id)
                 @author = message.author
                 message_id message
                 references message.root
                 recipients = message.notified_users
                 cc = ((message.root.notified_watchers + message.board.notified_watchers).uniq - recipients)
                 @message = message
                 @message_url = url_for(message.event_url)
                 mail :to => recipients,
                   :cc => cc,
                   :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
               end
               # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was added.
               #
               # Example:
               #   wiki_content_added(wiki_content) => Mail::Message object
               #   Mailer.wiki_content_added(wiki_content).deliver => sends an email to the project's recipients
               def wiki_content_added(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
                 recipients = wiki_content.notified_users
                 cc = wiki_content.page.wiki.notified_watchers - recipients
                 @wiki_content = wiki_content
                 @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                                   :id => wiki_content.page.title)
                 mail :to => recipients,
                   :cc => cc,
                   :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
               end
               # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was updated.
               #
               # Example:
               #   wiki_content_updated(wiki_content) => Mail::Message object
               #   Mailer.wiki_content_updated(wiki_content).deliver => sends an email to the project's recipients
               def wiki_content_updated(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
                 recipients = wiki_content.notified_users
                 cc = wiki_content.page.wiki.notified_watchers + wiki_content.page.notified_watchers - recipients
                 @wiki_content = wiki_content
                 @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                                   :id => wiki_content.page.title)
                 @wiki_diff_url = url_for(:controller => 'wiki', :action => 'diff',
                                                :project_id => wiki_content.project, :id => wiki_content.page.title,
                                                :version => wiki_content.version)
                 mail :to => recipients,
                   :cc => cc,
                   :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
               end
               # Builds a Mail::Message object used to email the specified user their account information.
               #
               # Example:
               #   account_information(user, password) => Mail::Message object
               #   Mailer.account_information(user, password).deliver => sends account information to the user
               def account_information(user, password)
                 set_language_if_valid user.language
                 @user = user
                 @password = password
                 @login_url = url_for(:controller => 'account', :action => 'login')
                 mail :to => user.mail,
                   :subject => l(:mail_subject_register, Setting.app_title)
               end
               # Builds a Mail::Message object used to email all active administrators of an account activation request.
               #
               # Example:
               #   account_activation_request(user) => Mail::Message object
               #   Mailer.account_activation_request(user).deliver => sends an email to all active administrators
               def account_activation_request(user)
                 # Send the email to all active administrators
                 recipients = User.active.where(:admin => true)
                 @user = user
                 @url = url_for(:controller => 'users', :action => 'index',
                                      :status => User::STATUS_REGISTERED,
                                      :sort_key => 'created_on', :sort_order => 'desc')
                 mail :to => recipients,
                   :subject => l(:mail_subject_account_activation_request, Setting.app_title)
               end
               # Builds a Mail::Message object used to email the specified user that their account was activated by an administrator.
               #
               # Example:
               #   account_activated(user) => Mail::Message object
               #   Mailer.account_activated(user).deliver => sends an email to the registered user
               def account_activated(user)
                 set_language_if_valid user.language
                 @user = user
                 @login_url = url_for(:controller => 'account', :action => 'login')
                 mail :to => user.mail,
                   :subject => l(:mail_subject_register, Setting.app_title)
               end
-              def lost_password(token)
+              def lost_password(token, recipient=nil)
                 set_language_if_valid(token.user.language)
+                recipient ||= token.user.mail
                 @token = token
                 @url = url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
-                mail :to => token.user.mail,
+                mail :to => recipient,
                   :subject => l(:mail_subject_lost_password, Setting.app_title)
               end
               def register(token)
                 set_language_if_valid(token.user.language)
                 @token = token
                 @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
                 mail :to => token.user.mail,
                   :subject => l(:mail_subject_register, Setting.app_title)
               end
               def test_email(user)
                 set_language_if_valid(user.language)
                 @url = url_for(:controller => 'welcome')
                 mail :to => user.mail,
                   :subject => 'Redmine test'
               end
               # Sends reminders to issue assignees
               # Available options:
               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
               # * :users    => array of user/group ids who should be reminded
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
                 user_ids = options[:users]
                 scope = Issue.open.where("#{Issue.table_name}.assigned_to_id IS NOT NULL" +
                   " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
                   " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date
                 )
                 scope = scope.where(:assigned_to_id => user_ids) if user_ids.present?
                 scope = scope.where(:project_id => project.id) if project
                 scope = scope.where(:tracker_id => tracker.id) if tracker
                 issues_by_assignee = scope.includes(:status, :assigned_to, :project, :tracker).
                                           group_by(&:assigned_to)
                 issues_by_assignee.keys.each do |assignee|
                   if assignee.is_a?(Group)
                     assignee.users.each do |user|
                       issues_by_assignee[user] ||= []
                       issues_by_assignee[user] += issues_by_assignee[assignee]
                     end
                   end
                 end
                 issues_by_assignee.each do |assignee, issues|
                   reminder(assignee, issues, days).deliver if assignee.is_a?(User) && assignee.active?
                 end
               end
               # Activates/desactivates email deliveries during +block+
               def self.with_deliveries(enabled = true, &block)
                 was_enabled = ActionMailer::Base.perform_deliveries
                 ActionMailer::Base.perform_deliveries = !!enabled
                 yield
               ensure
                 ActionMailer::Base.perform_deliveries = was_enabled
               end
               # Sends emails synchronously in the given block
               def self.with_synched_deliveries(&block)
                 saved_method = ActionMailer::Base.delivery_method
                 if m = saved_method.to_s.match(%r{^async_(.+)$})
                   synched_method = m[1]
                   ActionMailer::Base.delivery_method = synched_method.to_sym
                   ActionMailer::Base.send "#{synched_method}_settings=", ActionMailer::Base.send("async_#{synched_method}_settings")
                 end
                 yield
               ensure
                 ActionMailer::Base.delivery_method = saved_method
               end
               def mail(headers={}, &block)
                 headers.reverse_merge! 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title,
                         'X-Auto-Response-Suppress' => 'OOF',
                         'Auto-Submitted' => 'auto-generated',
                         'From' => Setting.mail_from,
                         'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
                 # Replaces users with their email addresses
                 [:to, :cc, :bcc].each do |key|
                   if headers[key].present?
                     headers[key] = self.class.email_addresses(headers[key])
                   end
                 end
                 # Removes the author from the recipients and cc
                 # if the author does not want to receive notifications
                 # about what the author do
                 if @author && @author.logged? && @author.pref.no_self_notified
                   addresses = @author.mails
                   headers[:to] -= addresses if headers[:to].is_a?(Array)
                   headers[:cc] -= addresses if headers[:cc].is_a?(Array)
                 end
                 if @author && @author.logged?
                   redmine_headers 'Sender' => @author.login
                 end
                 # Blind carbon copy recipients
                 if Setting.bcc_recipients?
                   headers[:bcc] = [headers[:to], headers[:cc]].flatten.uniq.reject(&:blank?)
                   headers[:to] = nil
                   headers[:cc] = nil
                 end
                 if @message_id_object
                   headers[:message_id] = "<#{self.class.message_id_for(@message_id_object)}>"
                 end
                 if @references_objects
                   headers[:references] = @references_objects.collect {|o| "<#{self.class.references_for(o)}>"}.join(' ')
                 end
                 m = if block_given?
                   super headers, &block
                 else
                   super headers do |format|
                     format.text
                     format.html unless Setting.plain_text_mail?
                   end
                 end
                 set_language_if_valid @initial_language
                 m
               end
               def initialize(*args)
                 @initial_language = current_language
                 set_language_if_valid Setting.default_language
                 super
               end
               def self.deliver_mail(mail)
                 return false if mail.to.blank? && mail.cc.blank? && mail.bcc.blank?
                 begin
                   # Log errors when raise_delivery_errors is set to false, Rails does not
                   mail.raise_delivery_errors = true
                   super
                 rescue Exception => e
                   if ActionMailer::Base.raise_delivery_errors
                     raise e
                   else
                     Rails.logger.error "Email delivery error: #{e.message}"
                   end
                 end
               end
               def self.method_missing(method, *args, &block)
                 if m = method.to_s.match(%r{^deliver_(.+)$})
                   ActiveSupport::Deprecation.warn "Mailer.deliver_#{m[1]}(*args) is deprecated. Use Mailer.#{m[1]}(*args).deliver instead."
                   send(m[1], *args).deliver
                 else
                   super
                 end
               end
               # Returns an array of email addresses to notify by
               # replacing users in arg with their notified email addresses
               #
               # Example:
               #   Mailer.email_addresses(users)
               #   => ["foo@example.net", "bar@example.net"]
               def self.email_addresses(arg)
                 arr = Array.wrap(arg)
                 mails = arr.reject {|a| a.is_a? Principal}
                 users = arr - mails
                 if users.any?
                   mails += EmailAddress.
                     where(:user_id => users.map(&:id)).
                     where("is_default = ? OR notify = ?", true, true).
                     pluck(:address)
                 end
                 mails
               end
               private
               # Appends a Redmine header field (name is prepended with 'X-Redmine-')
               def redmine_headers(h)
                 h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
               end
               def self.token_for(object, rand=true)
                 timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
                 hash = [
                   "redmine",
                   "#{object.class.name.demodulize.underscore}-#{object.id}",
                   timestamp.strftime("%Y%m%d%H%M%S")
                 ]
                 if rand
                   hash << Redmine::Utils.random_hex(8)
                 end
                 host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
                 host = "#{::Socket.gethostname}.redmine" if host.empty?
                 "#{hash.join('.')}@#{host}"
               end
               # Returns a Message-Id for the given object
               def self.message_id_for(object)
                 token_for(object, true)
               end
               # Returns a uniq token for a given object referenced by all notifications
               # related to this object
               def self.references_for(object)
                 token_for(object, false)
               end
               def message_id(object)
                 @message_id_object = object
               end
               def references(object)
                 @references_objects ||= []
                 @references_objects << object
               end
               def mylogger
                 Rails.logger
               end
             end

test/functional/account_controller_test.rb +14 0

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class AccountControllerTest < ActionController::TestCase
               fixtures :users, :roles
               def setup
                 User.current = nil
               end
               def test_get_login
                 get :login
                 assert_response :success
                 assert_template 'login'
                 assert_select 'input[name=username]'
                 assert_select 'input[name=password]'
               end
               def test_get_login_while_logged_in_should_redirect_to_back_url_if_present
                 @request.session[:user_id] = 2
                 @request.env["HTTP_REFERER"] = 'http://test.host/issues/show/1'
                 get :login, :back_url => 'http://test.host/issues/show/1'
                 assert_redirected_to '/issues/show/1'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_get_login_while_logged_in_should_redirect_to_referer_without_back_url
                 @request.session[:user_id] = 2
                 @request.env["HTTP_REFERER"] = 'http://test.host/issues/show/1'
                 get :login
                 assert_redirected_to '/issues/show/1'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_get_login_while_logged_in_should_redirect_to_home_by_default
                 @request.session[:user_id] = 2
                 get :login
                 assert_redirected_to '/'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_login_should_redirect_to_back_url_param
                 # request.uri is "test.host" in test environment
                 back_urls = [
                   'http://test.host/issues/show/1',
                   '/'
                 ]
                 back_urls.each do |back_url|
                   post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url
                   assert_redirected_to back_url
                 end
               end
               def test_login_with_suburi_should_redirect_to_back_url_param
                 @relative_url_root = Redmine::Utils.relative_url_root
                 Redmine::Utils.relative_url_root = '/redmine'
                 back_urls = [
                   'http://test.host/redmine/issues/show/1',
                   '/redmine'
                 ]
                 back_urls.each do |back_url|
                   post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url
                   assert_redirected_to back_url
                 end
               ensure
                 Redmine::Utils.relative_url_root = @relative_url_root
               end
               def test_login_should_not_redirect_to_another_host
                 back_urls = [
                   'http://test.foo/fake',
                   '//test.foo/fake'
                 ]
                 back_urls.each do |back_url|
                   post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url
                   assert_redirected_to '/my/page'
                 end
               end
               def test_login_with_suburi_should_not_redirect_to_another_suburi
                 @relative_url_root = Redmine::Utils.relative_url_root
                 Redmine::Utils.relative_url_root = '/redmine'
                 back_urls = [
                   'http://test.host/',
                   'http://test.host/fake',
                   'http://test.host/fake/issues',
                   'http://test.host/redmine/../fake',
                   'http://test.host/redmine/../fake/issues',
                   'http://test.host/redmine/%2e%2e/fake'
                 ]
                 back_urls.each do |back_url|
                   post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url
                   assert_redirected_to '/my/page'
                 end
               ensure
                 Redmine::Utils.relative_url_root = @relative_url_root
               end
               def test_login_with_wrong_password
                 post :login, :username => 'admin', :password => 'bad'
                 assert_response :success
                 assert_template 'login'
                 assert_select 'div.flash.error', :text => /Invalid user or password/
                 assert_select 'input[name=username][value=admin]'
                 assert_select 'input[name=password]'
                 assert_select 'input[name=password][value]', 0
               end
               def test_login_with_locked_account_should_fail
                 User.find(2).update_attribute :status, User::STATUS_LOCKED
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_redirected_to '/login'
                 assert_include 'locked', flash[:error]
                 assert_nil @request.session[:user_id]
               end
               def test_login_as_registered_user_with_manual_activation_should_inform_user
                 User.find(2).update_attribute :status, User::STATUS_REGISTERED
                 with_settings :self_registration => '2', :default_language => 'en' do
                   post :login, :username => 'jsmith', :password => 'jsmith'
                   assert_redirected_to '/login'
                   assert_include 'pending administrator approval', flash[:error]
                 end
               end
               def test_login_as_registered_user_with_email_activation_should_propose_new_activation_email
                 User.find(2).update_attribute :status, User::STATUS_REGISTERED
                 with_settings :self_registration => '1', :default_language => 'en' do
                   post :login, :username => 'jsmith', :password => 'jsmith'
                   assert_redirected_to '/login'
                   assert_equal 2, @request.session[:registered_user_id]
                   assert_include 'new activation email', flash[:error]
                 end
               end
               def test_login_should_rescue_auth_source_exception
                 source = AuthSource.create!(:name => 'Test')
                 User.find(2).update_attribute :auth_source_id, source.id
                 AuthSource.any_instance.stubs(:authenticate).raises(AuthSourceException.new("Something wrong"))
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 500
                 assert_select_error /Something wrong/
               end
               def test_login_should_reset_session
                 @controller.expects(:reset_session).once
                 post :login, :username => 'jsmith', :password => 'jsmith'
                 assert_response 302
               end
               def test_get_logout_should_not_logout
                 @request.session[:user_id] = 2
                 get :logout
                 assert_response :success
                 assert_template 'logout'
                 assert_equal 2, @request.session[:user_id]
               end
               def test_get_logout_with_anonymous_should_redirect
                 get :logout
                 assert_redirected_to '/'
               end
               def test_logout
                 @request.session[:user_id] = 2
                 post :logout
                 assert_redirected_to '/'
                 assert_nil @request.session[:user_id]
               end
               def test_logout_should_reset_session
                 @controller.expects(:reset_session).once
                 @request.session[:user_id] = 2
                 post :logout
                 assert_response 302
               end
               def test_get_register_with_registration_on
                 with_settings :self_registration => '3' do
                   get :register
                   assert_response :success
                   assert_template 'register'
                   assert_not_nil assigns(:user)
                   assert_select 'input[name=?]', 'user[password]'
                   assert_select 'input[name=?]', 'user[password_confirmation]'
                 end
               end
               def test_get_register_should_detect_user_language
                 with_settings :self_registration => '3' do
                   @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                   get :register
                   assert_response :success
                   assert_not_nil assigns(:user)
                   assert_equal 'fr', assigns(:user).language
                   assert_select 'select[name=?]', 'user[language]' do
                     assert_select 'option[value=fr][selected=selected]'
                   end
                 end
               end
               def test_get_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   get :register
                   assert_redirected_to '/'
                 end
               end
               # See integration/account_test.rb for the full test
               def test_post_register_with_registration_on
                 with_settings :self_registration => '3' do
                   assert_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'secret123',
                       :password_confirmation => 'secret123',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/my/account'
                   end
                   user = User.order('id DESC').first
                   assert_equal 'register', user.login
                   assert_equal 'John', user.firstname
                   assert_equal 'Doe', user.lastname
                   assert_equal 'register@example.com', user.mail
                   assert user.check_password?('secret123')
                   assert user.active?
                 end
               end
               def test_post_register_with_registration_off_should_redirect
                 with_settings :self_registration => '0' do
                   assert_no_difference 'User.count' do
                     post :register, :user => {
                       :login => 'register',
                       :password => 'test',
                       :password_confirmation => 'test',
                       :firstname => 'John',
                       :lastname => 'Doe',
                       :mail => 'register@example.com'
                     }
                     assert_redirected_to '/'
                   end
                 end
               end
               def test_get_lost_password_should_display_lost_password_form
                 get :lost_password
                 assert_response :success
                 assert_select 'input[name=mail]'
               end
               def test_lost_password_for_active_user_should_create_a_token
                 Token.delete_all
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'ActionMailer::Base.deliveries.size' do
                   assert_difference 'Token.count' do
                     with_settings :host_name => 'mydomain.foo', :protocol => 'http' do
                       post :lost_password, :mail => 'JSmith@somenet.foo'
                       assert_redirected_to '/login'
                     end
                   end
                 end
                 token = Token.order('id DESC').first
                 assert_equal User.find(2), token.user
                 assert_equal 'recovery', token.action
                 assert_select_email do
                   assert_select "a[href=?]", "http://mydomain.foo/account/lost_password?token=#{token.value}"
                 end
               end
+              def test_lost_password_using_additional_email_address_should_send_email_to_the_address
+                EmailAddress.create!(:user_id => 2, :address => 'anotherAddress@foo.bar')
+                Token.delete_all
+                assert_difference 'ActionMailer::Base.deliveries.size' do
+                  assert_difference 'Token.count' do
+                    post :lost_password, :mail => 'ANOTHERaddress@foo.bar'
+                    assert_redirected_to '/login'
+                  end
+                end
+                mail = ActionMailer::Base.deliveries.last
+                assert_equal ['anotherAddress@foo.bar'], mail.bcc
+              end
               def test_lost_password_for_unknown_user_should_fail
                 Token.delete_all
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'invalid@somenet.foo'
                   assert_response :success
                 end
               end
               def test_lost_password_for_non_active_user_should_fail
                 Token.delete_all
                 assert User.find(2).lock!
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'JSmith@somenet.foo'
                   assert_redirected_to '/account/lost_password'
                 end
               end
               def test_lost_password_for_user_who_cannot_change_password_should_fail
                 User.any_instance.stubs(:change_password_allowed?).returns(false)
                 assert_no_difference 'Token.count' do
                   post :lost_password, :mail => 'JSmith@somenet.foo'
                   assert_response :success
                 end
               end
               def test_get_lost_password_with_token_should_display_the_password_recovery_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 get :lost_password, :token => token.value
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_get_lost_password_with_invalid_token_should_redirect
                 get :lost_password, :token => "abcdef"
                 assert_redirected_to '/'
               end
               def test_post_lost_password_with_token_should_change_the_user_password
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/login'
                 user.reload
                 assert user.check_password?('newpass123')
                 assert_nil Token.find_by_id(token.id), "Token was not deleted"
               end
               def test_post_lost_password_with_token_for_non_active_user_should_fail
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 user.lock!
                 post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
                 assert_redirected_to '/'
                 assert ! user.check_password?('newpass123')
               end
               def test_post_lost_password_with_token_and_password_confirmation_failure_should_redisplay_the_form
                 user = User.find(2)
                 token = Token.create!(:action => 'recovery', :user => user)
                 post :lost_password, :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'wrongpass'
                 assert_response :success
                 assert_template 'password_recovery'
                 assert_not_nil Token.find_by_id(token.id), "Token was deleted"
                 assert_select 'input[type=hidden][name=token][value=?]', token.value
               end
               def test_post_lost_password_with_invalid_token_should_redirect
                 post :lost_password, :token => "abcdef", :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to '/'
               end
               def test_activation_email_should_send_an_activation_email
                 User.find(2).update_attribute :status, User::STATUS_REGISTERED
                 @request.session[:registered_user_id] = 2
                 with_settings :self_registration => '1' do
                   assert_difference 'ActionMailer::Base.deliveries.size' do
                     get :activation_email
                     assert_redirected_to '/login'
                   end
                 end
               end
               def test_activation_email_without_session_data_should_fail
                 User.find(2).update_attribute :status, User::STATUS_REGISTERED
                 with_settings :self_registration => '1' do
                   assert_no_difference 'ActionMailer::Base.deliveries.size' do
                     get :activation_email
                     assert_redirected_to '/'
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages