kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not request blank LDAP attributes. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2056 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-11-25 19:33:41 +00:00
parent db37e578f2
commit c54f15e35f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/auth_source.rb
View File

@ -38,7 +38,8 @@ class AuthSource < ActiveRecord::Base
begin begin
logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug? logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
attrs = source.authenticate(login, password) attrs = source.authenticate(login, password)
rescue rescue => e
logger.error "Error during authentication: #{e.message}"
attrs = nil attrs = nil
end end
return attrs if attrs return attrs if attrs

4
app/models/auth_source_ldap.rb
View File

@ -91,6 +91,8 @@ class AuthSourceLdap < AuthSource
end end
def self.get_attr(entry, attr_name) 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
end end