From 50f226348fabbbef2084258406816b75ccc56763 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 1 Sep 2018 03:35:37 +0200 Subject: Fix wrong string being used on login failure when using LDAP (#8534) Fix #8527 --- lib/devise/ldap_authenticatable.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/devise/ldap_authenticatable.rb b/lib/devise/ldap_authenticatable.rb index 534c7a851..6903d468d 100644 --- a/lib/devise/ldap_authenticatable.rb +++ b/lib/devise/ldap_authenticatable.rb @@ -25,11 +25,12 @@ module Devise ) 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)) user = User.ldap_get_user(user_info.first) success!(user) else - return fail(:invalid_login) + return fail(:invalid) end end end -- cgit From 08721170da48babbdd6a50fd79bbda7bdbed0a02 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 1 Sep 2018 03:37:43 +0200 Subject: Bump version to 2.5.0rc2 --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index a490478cd..ded1292f9 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc1' + 'rc2' end def to_a -- cgit