Merge pull request #6317 from jirutka/fix-ldap-dn-case

Fix searching by extern_uid for LDAP to be case-insensitive

Merge pull request #6317 from jirutka/fix-ldap-dn-case
Fix searching by extern_uid for LDAP to be case-insensitive
Dmitriy Zaporozhets
2 parents 5fef5458 91e7692b
Showing 1 changed file with 6 additions and 1 deletions Show diff stats
lib/gitlab/ldap/user.rb
@@ -81,8 +81,13 @@ module Gitlab
  
         private
  
+        def find_by_uid_and_provider
+          find_by_uid(uid)
+        end
+
         def find_by_uid(uid)
-          model.where(provider: provider, extern_uid: uid).last
+          # LDAP distinguished name is case-insensitive
+          model.where("provider = ? and lower(extern_uid) = ?", provider, uid.downcase).last
         end
  
         def username
...	...	@@ -81,8 +81,13 @@ module Gitlab
81	81
82	82	private
83	83
	84	+ def find_by_uid_and_provider
	85	+ find_by_uid(uid)
	86	+ end
	87	+
84	88	def find_by_uid(uid)
85		- model.where(provider: provider, extern_uid: uid).last
	89	+ # LDAP distinguished name is case-insensitive
	90	+ model.where("provider = ? and lower(extern_uid) = ?", provider, uid.downcase).last
86	91	end
87	92
88	93	def username
...	...