jro_apps/redmine Commit - r9746:76a4b81cf3a9

Fixed: Openid registration form should not require user to enter password (#11331)....

Jean-Philippe Lang -

r9746:76a4b81cf3a9

parent child

Context file:

r9746:76a4b81cf3a9

Collapse all files

app/controllers/account_controller.rb +5 -2

             # 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
               # Enable user to 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])
                   redirect_to(home_url) && return unless @token and !@token.expired?
                   @user = @token.user
                   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 :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
                     # user not found in db
                     (flash.now[:error] = l(:notice_account_unknown_email); return) unless user
                     # user uses an external authentification
                     (flash.now[:error] = l(:notice_can_t_change_password); return) if user.auth_source_id
                     # 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 :action => 'login'
                       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 = params[:user]
+                  @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]
-                    @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
+                    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 :action => 'login'
               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 :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)
                   redirect_to :action => 'login'
                 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 :action => 'login'
               end
             end

test/functional/account_controller_openid_test.rb +36 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__)
             class AccountControllerTest < ActionController::TestCase
               tests AccountController
               fixtures :users, :roles
               def setup
                 User.current = nil
                 Setting.openid = '1'
               end
               def teardown
                 Setting.openid = '0'
               end
               if Object.const_defined?(:OpenID)
                 def test_login_with_openid_for_existing_user
                   Setting.self_registration = '3'
                   existing_user = User.new(:firstname => 'Cool',
                                            :lastname => 'User',
                                            :mail => 'user@somedomain.com',
                                            :identity_url => 'http://openid.example.com/good_user')
                   existing_user.login = 'cool_user'
                   assert existing_user.save!
                   post :login, :openid_url => existing_user.identity_url
                   assert_redirected_to '/my/page'
                 end
                 def test_login_with_invalid_openid_provider
                   Setting.self_registration = '0'
                   post :login, :openid_url => 'http;//openid.example.com/good_user'
                   assert_redirected_to home_url
                 end
                 def test_login_with_openid_for_existing_non_active_user
                   Setting.self_registration = '2'
                   existing_user = User.new(:firstname => 'Cool',
                                            :lastname => 'User',
                                            :mail => 'user@somedomain.com',
                                            :identity_url => 'http://openid.example.com/good_user',
                                            :status => User::STATUS_REGISTERED)
                   existing_user.login = 'cool_user'
                   assert existing_user.save!
                   post :login, :openid_url => existing_user.identity_url
                   assert_redirected_to '/login'
                 end
                 def test_login_with_openid_with_new_user_created
                   Setting.self_registration = '3'
                   post :login, :openid_url => 'http://openid.example.com/good_user'
                   assert_redirected_to '/my/account'
                   user = User.find_by_login('cool_user')
                   assert user
                   assert_equal 'Cool', user.firstname
                   assert_equal 'User', user.lastname
                 end
                 def test_login_with_openid_with_new_user_and_self_registration_off
                   Setting.self_registration = '0'
                   post :login, :openid_url => 'http://openid.example.com/good_user'
                   assert_redirected_to home_url
                   user = User.find_by_login('cool_user')
                   assert_nil user
                 end
                 def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token
                   Setting.self_registration = '1'
                   post :login, :openid_url => 'http://openid.example.com/good_user'
                   assert_redirected_to '/login'
                   user = User.find_by_login('cool_user')
                   assert user
                   token = Token.find_by_user_id_and_action(user.id, 'register')
                   assert token
                 end
                 def test_login_with_openid_with_new_user_created_with_manual_activation
                   Setting.self_registration = '2'
                   post :login, :openid_url => 'http://openid.example.com/good_user'
                   assert_redirected_to '/login'
                   user = User.find_by_login('cool_user')
                   assert user
                   assert_equal User::STATUS_REGISTERED, user.status
                 end
                 def test_login_with_openid_with_new_user_with_conflict_should_register
                   Setting.self_registration = '3'
                   existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com')
                   existing_user.login = 'cool_user'
                   assert existing_user.save!
                   post :login, :openid_url => 'http://openid.example.com/good_user'
                   assert_response :success
                   assert_template 'register'
                   assert assigns(:user)
                   assert_equal 'http://openid.example.com/good_user', assigns(:user)[:identity_url]
                 end
+                def test_login_with_openid_with_new_user_with_missing_information_should_register
+                  Setting.self_registration = '3'
+                  post :login, :openid_url => 'http://openid.example.com/good_blank_user'
+                  assert_response :success
+                  assert_template 'register'
+                  assert assigns(:user)
+                  assert_equal 'http://openid.example.com/good_blank_user', assigns(:user)[:identity_url]
+                  assert_select 'input[name=?]', 'user[login]'
+                  assert_select 'input[name=?]', 'user[password]'
+                  assert_select 'input[name=?]', 'user[password_confirmation]'
+                  assert_select 'input[name=?][value=?]', 'user[identity_url]', 'http://openid.example.com/good_blank_user'
+                end
+                def test_register_after_login_failure_should_not_require_user_to_enter_a_password
+                  Setting.self_registration = '3'
+                  assert_difference 'User.count' do
+                    post :register, :user => {
+                      :login => 'good_blank_user',
+                      :password => '',
+                      :password_confirmation => '',
+                      :firstname => 'Cool',
+                      :lastname => 'User',
+                      :mail => 'user@somedomain.com',
+                      :identity_url => 'http://openid.example.com/good_blank_user'
+                    }
+                    assert_response 302
+                  end
+                  user = User.first(:order => 'id DESC')
+                  assert_equal 'http://openid.example.com/good_blank_user', user.identity_url
+                  assert user.hashed_password.blank?, "Hashed password was #{user.hashed_password}"
+                end
                 def test_setting_openid_should_return_true_when_set_to_true
                   assert_equal true, Setting.openid?
                 end
               else
                 puts "Skipping openid tests."
                 def test_dummy
                 end
               end
             end

test/mocks/open_id_authentication_mock.rb +2 -1

             # Mocks out OpenID
             #
             # http://www.northpub.com/articles/2007/04/02/testing-openid-support
             module OpenIdAuthentication
               EXTENSION_FIELDS = {'email'    => 'user@somedomain.com',
                                   'nickname' => 'cool_user',
                                   'country'  => 'US',
                                   'postcode' => '12345',
                                   'fullname' => 'Cool User',
                                   'dob'      => '1970-04-01',
                                   'language' => 'en',
                                   'timezone' => 'America/New_York'}
               protected
                 def authenticate_with_open_id(identity_url = params[:openid_url], options = {}) #:doc:
                   if User.find_by_identity_url(identity_url) || identity_url.include?('good')
+                    extension_response_fields = {}
                     # Don't process registration fields unless it is requested.
                     unless identity_url.include?('blank') || (options[:required].nil? && options[:optional].nil?)
-                      extension_response_fields = {}
                       options[:required].each do |field|
                         extension_response_fields[field.to_s] = EXTENSION_FIELDS[field.to_s]
                       end unless options[:required].nil?
                       options[:optional].each do |field|
                         extension_response_fields[field.to_s] = EXTENSION_FIELDS[field.to_s]
                       end unless options[:optional].nil?
                     end
                     yield Result[:successful], identity_url , extension_response_fields
                   else
                     logger.info "OpenID authentication failed: #{identity_url}"
                     yield Result[:failed], identity_url, nil
                   end
                 end
               private
                 def add_simple_registration_fields(open_id_response, fields)
                   open_id_response.add_extension_arg('sreg', 'required', [ fields[:required] ].flatten * ',') if fields[:required]
                   open_id_response.add_extension_arg('sreg', 'optional', [ fields[:optional] ].flatten * ',') if fields[:optional]
                 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