ldap_fluff 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968768aeccb6bb96fee53a8b9f154c17ecd526a4
-  data.tar.gz: a0fca576757b57e6a101f9078851c9cc76fd1f58
+  metadata.gz: 5648d1eb100608b85c3815cc5ae5a215cd1ce5b0
+  data.tar.gz: afb387b8210f7120263b218bb2e3def00a7deb80
 SHA512:
-  metadata.gz: f7e0bcce771b22667002b0f580c7844f1f34ff97f4616b9a52709faf0fdc984f8a739dd29a09174df17beab5cac426bfac9ccf9b2d4831237a1c56f8bd7c0884
-  data.tar.gz: cfc7a9d51be11a588c0c98d3b52e30c2c7fa9fd1a21e40cee80d3606cd3ec40d77430d010ea66df7ff1dde6a1d4e3fdb07bde5926bf27ce0c966b1d31a2137eb
+  metadata.gz: 11596e7ac3c290ab3270432bfc0f13fbed11d39a8ebd4daa9f5f699656405b1f5f27c9637afc8a4b08c4829a72e2cbea2084b50d38ff271c48bfa5d1354784cc
+  data.tar.gz: 58d72eb169b5df0a0d4f00cb29b44c56e82b7436b5b85e530daf4e17698768e1a3fd211f3e2c07ee0b1d7de344ef3477371196cbe1209aa5de1fae974559728a

data/lib/ldap_fluff/ad_member_service.rb

@@ -30,11 +30,11 @@ class LdapFluff::ActiveDirectory::MemberService < LdapFluff::GenericMemberServic
   def _walk_group_ancestry(group_dns = [])
     set = []
     group_dns.each do |group_dn|
-      search = @ldap.search(:base => group_dn, :scope => Net::LDAP::SearchScope_BaseObject)
+      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]
-        set  += _walk_group_ancestry(set)
       end
     end
     set

data/test/ad_member_services_test.rb

@@ -11,7 +11,7 @@ class TestADMemberService < MiniTest::Test
 
   def basic_user
     @ldap.expect(:search, ad_user_payload, [:filter => ad_name_filter("john")])
-    @ldap.expect(:search, ad_parent_payload(1), [:base => ad_group_dn, :scope => 0])
+    @ldap.expect(:search, ad_parent_payload(1), [:base => ad_group_dn, :scope => 0, :attributes => ['memberof']])
   end
 
   def basic_group
@@ -21,27 +21,27 @@ class TestADMemberService < MiniTest::Test
   def nest_deep(n)
     # add all the expects
     1.upto(n-1) do |i|
-      @ldap.expect(:search, ad_parent_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0])
+      @ldap.expect(:search, ad_parent_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0, :attributes => ['memberof']])
     end
     # terminate or we loop FOREVER
-    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0])
+    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0, :attributes => ['memberof']])
   end
 
   def double_nested(n)
     # add all the expects
     1.upto(n - 1) do |i|
-      @ldap.expect(:search, ad_double_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0])
+      @ldap.expect(:search, ad_double_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0, :attributes => ['memberof']])
     end
     # terminate or we loop FOREVER
-    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0])
+    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0, :attributes => ['memberof']])
     (n - 1).downto(1) do |j|
-      @ldap.expect(:search, [], [:base => ad_group_dn("broskies#{j + 1}"), :scope => 0])
+      @ldap.expect(:search, [], [:base => ad_group_dn("broskies#{j + 1}"), :scope => 0, :attributes => ['memberof']])
     end
   end
 
   def test_find_user
     basic_user
-    @ldap.expect(:search, [], [:base => ad_group_dn('bros1'), :scope => 0])
+    @ldap.expect(:search, [], [:base => ad_group_dn('bros1'), :scope => 0, :attributes => ['memberof']])
     @adms.ldap = @ldap
     assert_equal(%w(group bros1), @adms.find_user_groups("john"))
     @ldap.verify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap_fluff
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jordan O'Mara
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap