diff options
| -rw-r--r-- | app/models/auth_source_ldap.rb | 8 | ||||
| -rw-r--r-- | test/unit/auth_source_ldap_test.rb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 8ed7ce27f..888493338 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -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 diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index cec88ae7e..dd8506788 100644 --- a/test/unit/auth_source_ldap_test.rb +++ b/test/unit/auth_source_ldap_test.rb @@ -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 |