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

Refactor: Moved the check for an empty DN to authenticate_dn 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3449 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-02-18 16:55:05 +00:00
parent 899fb1079f
commit 82dd1b2bf2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/auth_source_ldap.rb
View File

@ -45,10 +45,9 @@ class AuthSourceLdap < AuthSource
:attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry| :attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
dn = entry.dn dn = entry.dn
attrs = get_user_attributes_from_ldap_entry(entry) if onthefly_register? attrs = get_user_attributes_from_ldap_entry(entry) if onthefly_register?
logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
end end
return nil if dn.empty?
logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
if authenticate_dn(dn, password) if authenticate_dn(dn, password)
logger.debug "Authentication successful for '#{login}'" if logger && logger.debug? logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
@ -100,6 +99,8 @@ class AuthSourceLdap < AuthSource
# Check if a DN (user record) authenticates with the password # Check if a DN (user record) authenticates with the password
def authenticate_dn(dn, password) def authenticate_dn(dn, password)
return nil if dn.empty?
ldap_con = initialize_ldap_con(dn, password) ldap_con = initialize_ldap_con(dn, password)
return ldap_con.bind return ldap_con.bind
end end