Commit fdeacf0ad19424850105fbe38d7bf5901d2d3c39
Exists in
spb-stable
and in
3 other branches
Merge pull request #6317 from jirutka/fix-ldap-dn-case
Fix searching by extern_uid for LDAP to be case-insensitive
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
lib/gitlab/ldap/user.rb
| @@ -81,8 +81,13 @@ module Gitlab | @@ -81,8 +81,13 @@ module Gitlab | ||
| 81 | 81 | ||
| 82 | private | 82 | private |
| 83 | 83 | ||
| 84 | + def find_by_uid_and_provider | ||
| 85 | + find_by_uid(uid) | ||
| 86 | + end | ||
| 87 | + | ||
| 84 | def find_by_uid(uid) | 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 | end | 91 | end |
| 87 | 92 | ||
| 88 | def username | 93 | def username |