From 37499d877adcaa8d9ffa76a9841bb463e5d1d22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=BCller?= Date: Wed, 20 May 2015 14:13:02 +0200 Subject: [PATCH] Add check for member attributes that just contain a uid for the LDAP group synchronization - the member attribute of groups provided by our company LDAP contains only a the members userid prefixed by 'uid=' an not the full dn of the user --> the member attribute has to be checked also for this value --- lib/gitlab/ldap/group.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/gitlab/ldap/group.rb b/lib/gitlab/ldap/group.rb index 7f0c7c63c3..712e08eed8 100644 --- a/lib/gitlab/ldap/group.rb +++ b/lib/gitlab/ldap/group.rb @@ -42,6 +42,8 @@ module Gitlab member_uids.any? { |member_uid| member_uid.downcase == user_uid } elsif member_dns.any? { |member_dn| member_dn.downcase == user_dn } true + elsif member_dns.any? { |member_dn| member_dn.downcase == "uid=" + user_uid } + true elsif adapter.config.active_directory adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter) end