meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-26 10:21:14 +00:00
Code Issues Releases Wiki Activity

Changes User.try_to_login to catch and log AuthSourceExceptions, and introduces User.try_to_login! replicating the original behavior (#34071).

Browse Source 
Patch by Jens Krämer.


git-svn-id: http://svn.redmine.org/redmine/trunk@20547 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-12-02 13:56:15 +00:00
parent f9d6dc3031
commit 1dcebf8ce0
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/account_controller.rb
View File

@ -308,7 +308,7 @@ class AccountController < ApplicationController
end
def password_authentication
user = User.try_to_login(params[:username], params[:password], false)
user = User.try_to_login!(params[:username], params[:password], false)
if user.nil?
invalid_credentials

10
app/models/user.rb
View File

@ -221,7 +221,17 @@ class User < Principal
end
# Returns the user that matches provided login and password, or nil
# AuthSource errors are caught, logged and nil is returned.
def self.try_to_login(login, password, active_only=true)
try_to_login!(login, password, active_only)
rescue AuthSourceException => e
logger.error "An error occured when authenticating #{login}: #{e.message}"
nil
end
# Returns the user that matches provided login and password, or nil
# AuthSource errors are passed through.
def self.try_to_login!(login, password, active_only=true)
login = login.to_s.strip
password = password.to_s

30
test/unit/user_test.rb
View File

@ -695,13 +695,31 @@ class UserTest < ActiveSupport::TestCase
assert_equal "ADMIN", user.login
end
if ldap_configured?
test "#try_to_login using LDAP with failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1)
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect')
test "#try_to_login! using LDAP with existing user and failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1)
user = users(:users_001)
user.update_column :auth_source_id, auth_source.id
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect')
assert_raise(AuthSourceException){ User.try_to_login!('admin', 'admin') }
end
assert_nil User.try_to_login('edavis', 'wrong')
end
test "#try_to_login using LDAP with existing user and failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1)
user = users(:users_001)
user.update_column :auth_source_id, auth_source.id
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect')
assert_nil User.try_to_login('admin', 'admin')
end
test "#try_to_login using LDAP with new user and failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1)
auth_source.update onthefly_register: true
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect')
assert_nil User.try_to_login('edavis', 'wrong')
end
if ldap_configured?
test "#try_to_login using LDAP" do
assert_nil User.try_to_login('edavis', 'wrong')