From c54f15e35f37adb8f6e025ce45dc7645c5f2292e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 25 Nov 2008 19:33:41 +0000 Subject: [PATCH] Do not request blank LDAP attributes. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2056 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/auth_source.rb | 3 ++- app/models/auth_source_ldap.rb | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb index a0a2cdc5f..537ed2d43 100644 --- a/app/models/auth_source.rb +++ b/app/models/auth_source.rb @@ -38,7 +38,8 @@ class AuthSource < ActiveRecord::Base begin logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug? attrs = source.authenticate(login, password) - rescue + rescue => e + logger.error "Error during authentication: #{e.message}" attrs = nil end return attrs if attrs diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 6203a7c85..a619b2f85 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -91,6 +91,8 @@ class AuthSourceLdap < AuthSource end def self.get_attr(entry, attr_name) - entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] + if !attr_name.blank? + entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] + end end end -- 2.39.5