meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Include an authentication method name in LDAP connection error messages (#33345).

Browse Source 
Contributed by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21310 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-12-13 09:16:46 +00:00
parent b4dbd821c9
commit 3cb5f9d6c5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/auth_source_ldap.rb
View File

@ -63,7 +63,7 @@ class AuthSourceLdap < AuthSource
end
end
rescue *NETWORK_EXCEPTIONS => e
raise AuthSourceException.new(e.message)
raise AuthSourceException.new("#{auth_method_name}: #{e.message}")
end
# Test the connection to the LDAP
@ -77,7 +77,7 @@ class AuthSourceLdap < AuthSource
end
end
rescue *NETWORK_EXCEPTIONS => e
raise AuthSourceException.new(e.message)
raise AuthSourceException.new("#{auth_method_name}: #{e.message}")
end
def auth_method_name
@ -107,7 +107,7 @@ class AuthSourceLdap < AuthSource
end
results
rescue *NETWORK_EXCEPTIONS => e
raise AuthSourceException.new(e.message)
raise AuthSourceException.new("#{auth_method_name}: #{e.message}")
end
def ldap_mode
@ -144,7 +144,7 @@ class AuthSourceLdap < AuthSource
return yield
end
rescue Timeout::Error => e
raise AuthSourceTimeoutException.new(e.message)
raise AuthSourceTimeoutException.new("#{auth_method_name}: #{e.message}")
end
def ldap_filter

6
test/unit/auth_source_ldap_test.rb
View File

@ -168,9 +168,10 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
auth_source.timeout = 1
def auth_source.initialize_ldap_con(*args); sleep(5); end
assert_raise AuthSourceTimeoutException do
error = assert_raise AuthSourceTimeoutException do
auth_source.authenticate 'example1', '123456'
end
assert_match /\ALDAP: /, error.message
end
def test_search_should_return_matching_entries
@ -210,9 +211,10 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
auth_source.host = "badhost"
auth_source.save!
assert_raise AuthSourceException do
error = assert_raise AuthSourceException do
auth_source.test_connection
end
assert_match /\ALDAP: /, error.message
end
def test_test_connection_with_incorrect_port