ldap_fluff 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e77169e6958e3e3c2abaa3963fb82e2e897d90
-  data.tar.gz: 393ddfd24ecb0f28f0d301b3edb30a8788adebb2
+  metadata.gz: 161e33a4c78a2bb8405942c777279117099659cd
+  data.tar.gz: 668e42def5a195c6ca935b2c7dcebe63ad96bf9b
 SHA512:
-  metadata.gz: 5e90e3e250a2385281f112968328d60b8039dd7c701c9a0d866f77962022bd68a1e57c82229c396e93617fc12d4ca51ec0d38aaa7e32b15ab4f990c7dca83d21
-  data.tar.gz: b7e6b676a1b16506271951f7a7f299b6f2e4bb7ebe89fffd79925f4e77c67dd690f6bbc5b2005066ccbe08a4fceea7706dce09cd0dc2304ab27d5ee3874ceb3f
+  metadata.gz: ae3b5e9be642e485cf2713d3f318985f891f9651a5ed3b069a572be045e26ae3398135093fe63929dc96fcd450637f216cd3440f22bee5ed94c48056afca2d45
+  data.tar.gz: 0ce4d8b5eb2b3ef58df3d314e41188503daa403cd14f078215a11c9f526662da9d3d59aa29b4a85dd90f4520b0257484f4735f2e10d03586577e6395ddacf40b

data/lib/ldap_fluff/generic.rb

@@ -43,8 +43,7 @@ class LdapFluff::Generic
     return [] unless group_exists?(gid)
     search = @member_service.find_group(gid).last
 
-    method = [:member, :ismemberof, :memberof,
-              :memberuid, :uniquemember].find { |m| search.respond_to? m } or
+    method = [:member, :memberuid, :uniquemember].find { |m| search.respond_to? m } or
              return []
 
     users_from_search_results(search, method)

data/test/ad_test.rb

@@ -172,4 +172,28 @@ class TestAD < MiniTest::Test
     md.verify
   end
 
+  def test_find_users_with_empty_nested_group
+    group        = Net::LDAP::Entry.new('foremaners')
+    nested_group = Net::LDAP::Entry.new('katellers')
+    nested_user  = Net::LDAP::Entry.new('testuser')
+
+    group[:member] = ['CN=Test User,CN=Users,DC=corp,DC=windows,DC=com', 'CN=katellers,DC=corp,DC=windows,DC=com']
+    nested_group[:cn] = ['katellers']
+    nested_group[:objectclass] = ['organizationalunit']
+    nested_group[:memberof] = ['CN=foremaners,DC=corp,DC=windows,DC=com']
+    nested_user[:objectclass]  = ['person']
+
+    md = MiniTest::Mock.new
+    2.times { md.expect(:find_group, [group], ['foremaners']) }
+    2.times { md.expect(:find_group, [nested_group], ['katellers']) }
+    2.times { service_bind }
+
+    md.expect(:find_by_dn, [nested_user],  ['CN=Test User,CN=Users,DC=corp,DC=windows,DC=com'])
+    md.expect(:find_by_dn, [nested_group], ['CN=katellers,DC=corp,DC=windows,DC=com'])
+    md.expect(:get_login_from_entry, 'testuser', [nested_user])
+    @ad.member_service = md
+    assert_equal @ad.users_for_gid('foremaners'), ['testuser']
+    md.verify
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap_fluff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jordan O'Mara
@@ -9,10 +9,11 @@ authors:
 - Petr Chalupa
 - Adam Price
 - Marek Hulan
+- Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
@@ -91,6 +92,7 @@ email:
 - pchalupa@redhat.com
 - komidore64@gmail.com
 - mhulan@redhat.com
+- dominic@cleal.org
 executables: []
 extensions: []
 extra_rdoc_files: