Merge branch 'move_ee_ldap_person' into 'master'

Move all EE-only changes for LDAP::Person to EE module

See merge request !2235

lib/ee/gitlab/ldap/person.rb

@@ -43,6 +43,22 @@ module EE
             .reverse
             .join('.')
         end
+
+        def memberof
+          return [] unless entry.attribute_names.include?(:memberof)
+
+          entry.memberof
+        end
+
+        def group_cns
+          memberof.map { |memberof_value| cn_from_memberof(memberof_value) }
+        end
+
+        def cn_from_memberof(memberof)
+          # Only get the first CN value of the string, that's the one that contains
+          # the group name
+          memberof.match(/(?:cn=([\w\s]+))/i)&.captures&.first
+        end
       end
     end
   end

lib/gitlab/ldap/person.rb

+# Contains methods common to both GitLab CE and EE.
+# All EE methods should be in `EE::Gitlab::LDAP::Person` only.
 module Gitlab
   module LDAP
     class Person
@@ -45,22 +47,6 @@ module Gitlab
         attribute_value(:email)
       end
 
-      def memberof
-        return [] unless entry.attribute_names.include?(:memberof)
-
-        entry.memberof
-      end
-
-      def group_cns
-        memberof.map { |memberof_value| cn_from_memberof(memberof_value) }
-      end
-
-      def cn_from_memberof(memberof)
-        # Only get the first CN value of the string, that's the one that contains
-        # the group name
-        memberof.match(/(?:cn=([\w\s]+))/i)&.captures&.first
-      end
-
       delegate :dn, to: :entry
 
       private

spec/lib/ee/gitlab/ldap/person_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Gitlab::LDAP::Person do
   include LdapHelpers
 
+  let(:entry) { ldap_user_entry('john.doe') }
+
   it 'includes the EE module' do
     expect(described_class).to include(EE::Gitlab::LDAP::Person)
   end
@@ -108,4 +110,51 @@ describe Gitlab::LDAP::Person do
       end
     end
   end
+
+  describe '#memberof' do
+    it 'returns an empty array if the field was not present' do
+      person = described_class.new(entry, 'ldapmain')
+
+      expect(person.memberof).to eq([])
+    end
+
+    it 'returns the values of `memberof` if the field was present' do
+      example_memberof = ['CN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com',
+                          'CN=Domain Admins,CN=Users,DC=Vosmaer,DC=com',
+                          'CN=Enterprise Admins,CN=Users,DC=Vosmaer,DC=com',
+                          'CN=Schema Admins,CN=Users,DC=Vosmaer,DC=com',
+                          'CN=Administrators,CN=Builtin,DC=Vosmaer,DC=com']
+      entry['memberof'] = example_memberof
+      person = described_class.new(entry, 'ldapmain')
+
+      expect(person.memberof).to eq(example_memberof)
+    end
+  end
+
+  describe '#cn_from_memberof' do
+    it 'gets the group cn from the memberof value' do
+      person = described_class.new(entry, 'ldapmain')
+
+      expect(person.cn_from_memberof('cN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com'))
+        .to eq('Group Policy Creator Owners')
+    end
+
+    it "doesn't break when there is no CN property" do
+      person = described_class.new(entry, 'ldapmain')
+
+      expect(person.cn_from_memberof('DC=Vosmaer,DC=com'))
+        .to be_nil
+    end
+  end
+
+  describe '#group_cns' do
+    it 'returns only CNs from the memberof values' do
+      example_memberof = ['CN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com',
+                          'CN=Administrators,CN=Builtin,DC=Vosmaer,DC=com']
+      entry['memberof'] = example_memberof
+      person = described_class.new(entry, 'ldapmain')
+
+      expect(person.group_cns).to eq(['Group Policy Creator Owners', 'Administrators'])
+    end
+  end
 end

spec/lib/gitlab/ldap/person_spec.rb

@@ -43,51 +43,4 @@ describe Gitlab::LDAP::Person do
       expect(person.email).to eq([user_principal_name])
     end
   end
-
-  describe '#memberof' do
-    it 'returns an empty array if the field was not present' do
-      person = described_class.new(entry, 'ldapmain')
-
-      expect(person.memberof).to eq([])
-    end
-
-    it 'returns the values of `memberof` if the field was present' do
-      example_memberof = ['CN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com',
-                          'CN=Domain Admins,CN=Users,DC=Vosmaer,DC=com',
-                          'CN=Enterprise Admins,CN=Users,DC=Vosmaer,DC=com',
-                          'CN=Schema Admins,CN=Users,DC=Vosmaer,DC=com',
-                          'CN=Administrators,CN=Builtin,DC=Vosmaer,DC=com']
-      entry['memberof'] = example_memberof
-      person = described_class.new(entry, 'ldapmain')
-
-      expect(person.memberof).to eq(example_memberof)
-    end
-  end
-
-  describe '#cn_from_memberof' do
-    it 'gets the group cn from the memberof value' do
-      person = described_class.new(entry, 'ldapmain')
-
-      expect(person.cn_from_memberof('cN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com'))
-        .to eq('Group Policy Creator Owners')
-    end
-
-    it "doesn't break when there is no CN property" do
-      person = described_class.new(entry, 'ldapmain')
-
-      expect(person.cn_from_memberof('DC=Vosmaer,DC=com'))
-        .to be_nil
-    end
-  end
-
-  describe '#group_cns' do
-    it 'returns only CNs from the memberof values' do
-      example_memberof = ['CN=Group Policy Creator Owners,CN=Users,DC=Vosmaer,DC=com',
-                          'CN=Administrators,CN=Builtin,DC=Vosmaer,DC=com']
-      entry['memberof'] = example_memberof
-      person = described_class.new(entry, 'ldapmain')
-
-      expect(person.group_cns).to eq(['Group Policy Creator Owners', 'Administrators'])
-    end
-  end
 end