OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix wrong string being used on login failure when using LDAP (#8534) 

Fix #8527
pull/8548/head
Eugen Rochko 2018-09-01 03:35:37 +02:00 committed by GitHub
parent 45c0f5433c
commit 50f226348f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/devise/ldap_authenticatable.rb
View File

@ -25,11 +25,12 @@ module Devise
) )
filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, email: email) filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, email: email)
if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: password)) if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: password))
user = User.ldap_get_user(user_info.first) user = User.ldap_get_user(user_info.first)
success!(user) success!(user)
else else
return fail(:invalid_login) return fail(:invalid)
end end
end end
end end