]> cat aescling's git repositories - mastodon.git/commitdiff
Fix wrong string being used on login failure when using LDAP (#8534)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 1 Sep 2018 01:35:37 +0000 (03:35 +0200)
committerGitHub <noreply@github.com>
Sat, 1 Sep 2018 01:35:37 +0000 (03:35 +0200)
Fix #8527

lib/devise/ldap_authenticatable.rb

index 534c7a851754e6fa99e72557a8e90bd7b7bb2f37..6903d468dc4958a8d2cf504f626e3f3871591be4 100644 (file)
@@ -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