ldap_fluff 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bbb3a76eb304f5d32ed7cb7b4cbc0e8b2551be
-  data.tar.gz: 179e0be4fe95dd4da12e036d64691fe8c8597df9
+  metadata.gz: 968768aeccb6bb96fee53a8b9f154c17ecd526a4
+  data.tar.gz: a0fca576757b57e6a101f9078851c9cc76fd1f58
 SHA512:
-  metadata.gz: bdd878bcb8282f68359fac8376931d32b09f1c5b02b3fb25ca777855e3507460102711337129969f90f86ddc03a69a66ef97593c57956cebc4ef72e5154fd5bc
-  data.tar.gz: dbd1e8e105c879941c04a50b2c7e1a0aafa705e287ff38b2b62fbcd7bef983494c3ecaf517476ca5574409606208cb2192345dea3fac6e2307273c7c2e89d921
+  metadata.gz: f7e0bcce771b22667002b0f580c7844f1f34ff97f4616b9a52709faf0fdc984f8a739dd29a09174df17beab5cac426bfac9ccf9b2d4831237a1c56f8bd7c0884
+  data.tar.gz: cfc7a9d51be11a588c0c98d3b52e30c2c7fa9fd1a21e40cee80d3606cd3ec40d77430d010ea66df7ff1dde6a1d4e3fdb07bde5926bf27ce0c966b1d31a2137eb

data/lib/ldap_fluff/ad_member_service.rb

@@ -19,22 +19,21 @@ class LdapFluff::ActiveDirectory::MemberService < LdapFluff::GenericMemberServic
   def _groups_from_ldap_data(payload)
     data = []
     if !payload.nil?
-      first_level  = get_groups(payload[:memberof])
+      first_level  = payload[:memberof]
       total_groups = _walk_group_ancestry(first_level)
-      data         = (first_level + total_groups).uniq
+      data         = (get_groups(first_level + total_groups)).uniq
     end
     data
   end
 
   # recursively loop over the parent list
-  def _walk_group_ancestry(gids = [])
+  def _walk_group_ancestry(group_dns = [])
     set = []
-    gids.each do |g|
-      filter = group_filter(g) & class_filter
-      search = @ldap.search(:filter => filter, :base => @group_base)
+    group_dns.each do |group_dn|
+      search = @ldap.search(:base => group_dn, :scope => Net::LDAP::SearchScope_BaseObject)
       if !search.nil? && !search.first.nil?
         group = search.first
-        set  += get_groups(group[:memberof])
+        set  += group[:memberof]
         set  += _walk_group_ancestry(set)
       end
     end

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), [:filter => @gfilter, :base => @config.group_base])
+    @ldap.expect(:search, ad_parent_payload(1), [:base => ad_group_dn, :scope => 0])
   end
 
   def basic_group
@@ -20,32 +20,28 @@ class TestADMemberService < MiniTest::Test
 
   def nest_deep(n)
     # add all the expects
-    1.upto(n - 1) do |i|
-      gfilter_bros = group_filter("bros#{i}") & group_class_filter
-      @ldap.expect(:search, ad_parent_payload(i + 1), [:filter => gfilter_bros, :base => @config.group_base])
+    1.upto(n-1) do |i|
+      @ldap.expect(:search, ad_parent_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0])
     end
     # terminate or we loop FOREVER
-    @ldap.expect(:search, [], [:filter => group_filter("bros#{n}") & group_class_filter, :base => @config.group_base])
+    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0])
   end
 
   def double_nested(n)
     # add all the expects
     1.upto(n - 1) do |i|
-      gfilter_bros = group_filter("bros#{i}") & group_class_filter
-      @ldap.expect(:search, ad_double_payload(i + 1), [:filter => gfilter_bros, :base => @config.group_base])
+      @ldap.expect(:search, ad_double_payload(i + 1), [:base => ad_group_dn("bros#{i}"), :scope => 0])
     end
     # terminate or we loop FOREVER
-    @ldap.expect(:search, [], [:filter => group_filter("bros#{n}") & group_class_filter, :base => @config.group_base])
+    @ldap.expect(:search, [], [:base => ad_group_dn("bros#{n}"), :scope => 0])
     (n - 1).downto(1) do |j|
-      gfilter_bros = group_filter("broskies#{j + 1}") & group_class_filter
-      @ldap.expect(:search, [], [:filter => gfilter_bros, :base => @config.group_base])
+      @ldap.expect(:search, [], [:base => ad_group_dn("broskies#{j + 1}"), :scope => 0])
     end
   end
 
   def test_find_user
     basic_user
-    gfilter_bros = group_filter('bros1') & group_class_filter
-    @ldap.expect(:search, [], [:filter => gfilter_bros, :base => @config.group_base])
+    @ldap.expect(:search, [], [:base => ad_group_dn('bros1'), :scope => 0])
     @adms.ldap = @ldap
     assert_equal(%w(group bros1), @adms.find_user_groups("john"))
     @ldap.verify

data/test/ad_test.rb

@@ -25,10 +25,10 @@ class TestAD < MiniTest::Test
 
   def test_good_bind_with_dn
     # no expectation on the service account
-    @ldap.expect(:auth, nil, [ad_user_bind('Internet User'), "password"])
+    @ldap.expect(:auth, nil, [ad_user_dn('Internet User'), "password"])
     @ldap.expect(:bind, true)
     @ad.ldap = @ldap
-    assert_equal(@ad.bind?(ad_user_bind('Internet User'), 'password'), true)
+    assert_equal(@ad.bind?(ad_user_dn('Internet User'), 'password'), true)
     @ldap.verify
   end
 
@@ -36,11 +36,11 @@ class TestAD < MiniTest::Test
     # looks up the account name's full DN via the service account
     @md = MiniTest::Mock.new
     user_result = MiniTest::Mock.new
-    user_result.expect(:dn, ad_user_bind('Internet User'))
+    user_result.expect(:dn, ad_user_dn('Internet User'))
     @md.expect(:find_user, [user_result], %w(internet))
     @ad.member_service = @md
     service_bind
-    @ldap.expect(:auth, nil, [ad_user_bind('Internet User'), "password"])
+    @ldap.expect(:auth, nil, [ad_user_dn('Internet User'), "password"])
     @ldap.expect(:bind, true)
     assert_equal(@ad.bind?('internet', 'password'), true)
     @ldap.verify

data/test/lib/ldap_test_helper.rb

@@ -74,24 +74,28 @@ module LdapTestHelper
     "uid=#{uid},cn=users,cn=accounts,#{@config.base_dn}"
   end
 
-  def ad_user_bind(name)
+  def ad_user_dn(name)
     "CN=#{name},CN=Users,#{@config.base_dn}"
   end
 
+  def ad_group_dn(name='group')
+    "cn=#{name},#{@config.group_base}"
+  end
+
   def ad_user_payload
-    [{ :memberof => ["cn=group,dc=internet,dc=com"] }]
+    [{ :memberof => [ad_group_dn] }]
   end
 
   def ad_group_payload
-    [{ :cn => "broze", :memberof => ["cn=group,dc=internet,dc=com"] }]
+    [{ :cn => "group", :memberof => [ad_group_dn] }]
   end
 
   def ad_parent_payload(num)
-    [{ :memberof => ["cn=bros#{num},dc=internet,dc=com"] }]
+    [{ :memberof => [ad_group_dn("bros#{num}")] }]
   end
 
   def ad_double_payload(num)
-    [{ :memberof => ["cn=bros#{num},dc=internet,dc=com", "cn=broskies#{num},dc=internet,dc=com"] }]
+    [{ :memberof => [ad_group_dn("bros#{num}"), ad_group_dn("broskies#{num}")] }]
   end
 
   def posix_user_payload

metadata

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