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 1/3] 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 From 7fccd518952cffe7b3c9787f4fb24fedc719bdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=BCller?= Date: Wed, 20 May 2015 14:18:16 +0200 Subject: [PATCH 2/3] Check also the submember attributes during the LDAP group synchronization - a group within our company LDAP contains members and submembers --> also the submember attributes need to be check for the LDAP group synchronization --- lib/gitlab/ldap/group.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/ldap/group.rb b/lib/gitlab/ldap/group.rb index 712e08eed8..53ec0d585a 100644 --- a/lib/gitlab/ldap/group.rb +++ b/lib/gitlab/ldap/group.rb @@ -50,7 +50,9 @@ module Gitlab end def member_dns - if entry.respond_to? :member + if (entry.respond_to? :member) && (entry.respond_to? :submember) + entry.member + entry.submember + elsif entry.respond_to? :member entry.member elsif entry.respond_to? :uniquemember entry.uniquemember From 0e91c7eb0fd77e56b7cfdd4fd0be0fce9e1c8a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=BCller?= Date: Wed, 27 May 2015 16:35:47 +0200 Subject: [PATCH 3/3] Add CHANGELOG entry --- CHANGELOG-EE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG-EE b/CHANGELOG-EE index 4bc0325d81..47664a291d 100644 --- a/CHANGELOG-EE +++ b/CHANGELOG-EE @@ -1,5 +1,7 @@ v 7.12 (Unreleased) - Fix error when viewing merge request with a commit that includes "Closes #". + - Enhance LDAP group synchronization to check also for member attributes that only contain "uid=" + - Enhance LDAP group synchronization to check also for submember attributes v 7.11.2 - Fixed license upload and verification mechanism