ldap_fluff 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70fb2df0843767e279fa3f4e21b5d55957eebe3c
-  data.tar.gz: a726ad37d1dbdf745463a53ea2bf1b72e2b3f292
+  metadata.gz: e3d33acdb243099b2ee9f857a8b04fdfa3b5c1aa
+  data.tar.gz: 54b60edbfbbdbdd5ec4ee00bd9a3ffc597b5545c
 SHA512:
-  metadata.gz: 3cd6ecad871dbaeca2ecb140443a8a6e5e2cca0247c8234d4f3c2b2089cbe907e7cb39d1b1d47280533aa9f7169428406d63790c9624760921a398b9476b1cb0
-  data.tar.gz: d2aca6c899fd9096c2611bb21e6b361e3d9af7fca4fd78d6627b5870f7035f13d4f22dccbe06b8f6b749c0c3ce6f2d38e981d9b3dc36d7ac39b4280e83fc233c
+  metadata.gz: b136a75e77332a2126113ad0a25ff64a78491442a1d8a62a60277d0f87c7a08b8df82a470f98580c6770005f3e6f3aed2948df85f41a9e8eadc43b749fd301c6
+  data.tar.gz: e504f2754e5f10b209a2c1df890c9aa2158a681dd5f6cb31556d73047f392ab3cafc372415323fbcb154a341bf330647c37ccb1afb1ea538dc632f657c7059e7

data/lib/ldap_fluff/ad_member_service.rb

@@ -19,25 +19,28 @@ class LdapFluff::ActiveDirectory::MemberService < LdapFluff::GenericMemberServic
   def _groups_from_ldap_data(payload)
     data = []
     if !payload.nil?
-      first_level  = payload[:memberof]
-      total_groups = _walk_group_ancestry(first_level)
-      data         = (get_groups(first_level + total_groups)).uniq
+      first_level     = payload[:memberof]
+      total_groups, _ = _walk_group_ancestry(first_level, first_level)
+      data            = (get_groups(first_level + total_groups)).uniq
     end
     data
   end
 
   # recursively loop over the parent list
-  def _walk_group_ancestry(group_dns = [])
+  def _walk_group_ancestry(group_dns = [], known_groups = [])
     set = []
     group_dns.each do |group_dn|
       search = @ldap.search(:base => group_dn, :scope => Net::LDAP::SearchScope_BaseObject, :attributes => ['memberof'])
       if !search.nil? && !search.first.nil?
-        group = search.first
-        set  += _walk_group_ancestry(group[:memberof])
-        set  += group[:memberof]
+        groups                       = search.first[:memberof] - known_groups
+        known_groups                += groups
+        next_level, new_known_groups = _walk_group_ancestry(groups, known_groups)
+        set                         += next_level
+        set                         += groups
+        known_groups                += next_level
       end
     end
-    set
+    [set, known_groups]
   end
 
   def class_filter

data/test/ad_member_services_test.rb

@@ -47,6 +47,16 @@ class TestADMemberService < MiniTest::Test
     @ldap.verify
   end
 
+  def test_nested_groups
+    basic_user
+    # basic user is memberof 'group'... and 'group' is memberof 'bros1'
+    # now make 'bros1' be memberof 'group' again
+    @ldap.expect(:search, ad_user_payload, [:base => ad_group_dn('bros1'), :scope => 0, :attributes => ['memberof']])
+    @adms.ldap = @ldap
+    assert_equal(%w(group bros1), @adms.find_user_groups("john"))
+    @ldap.verify
+  end
+
   def test_missing_user
     @ldap.expect(:search, nil, [:filter => ad_name_filter("john")])
     @adms.ldap = @ldap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap_fluff
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jordan O'Mara
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap