jro_apps/redmine Commit - r9763:c11f5a23fee2

Code cleanup....

Jean-Philippe Lang -

r9763:c11f5a23fee2

parent child

Context file:

r9763:c11f5a23fee2

Collapse all files

app/controllers/account_controller.rb +4 0

              # Redmine - project management software
              # Copyright (C) 2006-2012  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
                # Login request and validation
                def login
                  if request.get?
                    logout_user
                  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
                  logout_user
                  redirect_to home_url
                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_by_action_and_value("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)
                      # user not found or not active
                      unless user && user.active?
                        flash.now[:error] = l(:notice_account_unknown_email)
                        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
                        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 => Setting.default_language)
                  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 :controller => 'my', :action => 'account'
                      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]
                  token = Token.find_by_action_and_value('register', params[:token])
                  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
                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])
                  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
                    successful_authentication(user)
                  end
                end
                def open_id_authenticate(openid_url)
                  authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_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
                          account_pending
                        end
                      end
                    end
                  end
                end
                def successful_authentication(user)
                  # 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 :controller => 'my', :action => 'page'
                end
                def set_autologin_cookie(user)
                  token = Token.create(:user => user, :action => 'autologin')
                  cookie_name = Redmine::Configuration['autologin_cookie_name'] || '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[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 register_path
                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)
                    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 :controller => 'my', :action => 'account'
                  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
                  else
                    yield if block_given?
                  end
                end
                def account_pending
                  flash[:notice] = l(:notice_account_pending)
                  redirect_to signin_path
                end
              end

test/functional/account_controller_test.rb +54 0

              # Redmine - project management software
              # Copyright (C) 2006-2012  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__)
              require 'account_controller'
              # Re-raise errors caught by the controller.
              class AccountController; def rescue_action(e) raise e end; end
              class AccountControllerTest < ActionController::TestCase
                fixtures :users, :roles
                def setup
                  @controller = AccountController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
                end
                def test_login_should_redirect_to_back_url_param
                  # request.uri is "test.host" in test environment
                  post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.host%2Fissues%2Fshow%2F1'
                  assert_redirected_to '/issues/show/1'
                end
                def test_login_should_not_redirect_to_another_host
                  post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.foo%2Ffake'
                  assert_redirected_to '/my/page'
                end
                def test_login_with_wrong_password
                  post :login, :username => 'admin', :password => 'bad'
                  assert_response :success
                  assert_template 'login'
                  assert_tag 'div',
                             :attributes => { :class => "flash error" },
                             :content => /Invalid user or password/
                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_error_tag :content => /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_logout
                  @request.session[:user_id] = 2
                  get :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
                  get :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_tag 'input', :attributes => {:name => 'user[password]'}
                    assert_tag 'input', :attributes => {:name => 'user[password_confirmation]'}
                  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 => 'test',
                        :password_confirmation => 'test',
                        :firstname => 'John',
                        :lastname => 'Doe',
                        :mail => 'register@example.com'
                      }
                      assert_redirected_to '/my/account'
                    end
                    user = User.first(:order => 'id DESC')
                    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?('test')
                    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_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_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 => 'newpass', :new_password_confirmation => 'newpass'
+                 assert_redirected_to '/login'
+                 user.reload
+                 assert user.check_password?('newpass')
+                 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 => 'newpass', :new_password_confirmation => 'newpass'
+                 assert_redirected_to '/'
+                 assert ! user.check_password?('newpass')
+               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
              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