ldap_fluff 0.5.0 → 0.6.0

data/test/lib/ldap_test_helper.rb

@@ -7,17 +7,16 @@ module LdapTestHelper
   attr_accessor :group_base, :class_filter, :user
 
   def config_hash
-    { :host          => "internet.com",
-      :port          => "387",
-      :encryption    => :start_tls,
-      :base_dn       => "dc=internet,dc=com",
-      :group_base    => "ou=group,dc=internet,dc=com",
-      :service_user  => "service",
-      :service_pass  => "pass",
-      :server_type   => :free_ipa,
-      :attr_login    => nil,
-      :search_filter => nil
-    }
+    { :host => "internet.com",
+      :port => "387",
+      :encryption => :start_tls,
+      :base_dn => "dc=internet,dc=com",
+      :group_base => "ou=group,dc=internet,dc=com",
+      :service_user => "service",
+      :service_pass => "pass",
+      :server_type => :free_ipa,
+      :attr_login => nil,
+      :search_filter => nil }
   end
 
   def setup
@@ -40,13 +39,13 @@ module LdapTestHelper
 
   def basic_user
     @md = MiniTest::Mock.new
-    @md.expect(:find_user_groups, %w(bros), %w(john))
+    @md.expect(:find_user_groups, %w[bros], %w[john])
     get_test_instance_variable.member_service = @md
   end
 
   def bigtime_user
     @md = MiniTest::Mock.new
-    @md.expect(:find_user_groups, %w(bros broskies), %w(john))
+    @md.expect(:find_user_groups, %w[bros broskies], %w[john])
     get_test_instance_variable.member_service = @md
   end
 
@@ -82,11 +81,15 @@ module LdapTestHelper
     "CN=#{name},CN=Users,#{@config.base_dn}"
   end
 
-  def ad_group_dn(name='group')
+  def ad_group_dn(name = 'group')
     "cn=#{name},#{@config.group_base}"
   end
 
-  def ad_user_payload
+  def ad_user_payload(name = nil)
+    unless name.nil?
+      return [{ :memberof => [ad_group_dn], :distinguishedname => [ad_user_dn(name)] }]
+    end
+
     [{ :memberof => [ad_group_dn] }]
   end
 
@@ -110,7 +113,7 @@ module LdapTestHelper
     [{ :cn => ["broze"] }]
   end
 
-  def posix_netgroup_payload(cn, netgroups=[])
+  def posix_netgroup_payload(cn, netgroups = [])
     [{ :cn => [cn], :nisnetgrouptriple => netgroups }]
   end
 
@@ -120,7 +123,7 @@ module LdapTestHelper
       entry_1['cn'] = 'John'
       entry_2 = Net::LDAP::Entry.new
       entry_2['memberof'] = ['cn=group,dc=internet,dc=com', 'cn=bros,dc=internet,dc=com']
-      [ entry_1, entry_2 ]
+      [entry_1, entry_2]
     end
   end
 
@@ -128,7 +131,7 @@ module LdapTestHelper
     [{ :cn => 'group' }, { :memberof => ['cn=group,dc=internet,dc=com', 'cn=bros,dc=internet,dc=com'] }]
   end
 
-  def ipa_netgroup_payload(cn, netgroups=[])
+  def ipa_netgroup_payload(cn, netgroups = [])
     [{ :cn => [cn], :nisnetgrouptriple => netgroups }]
   end
 

data/test/posix_member_services_test.rb

@@ -11,7 +11,7 @@ class TestPosixMemberService < MiniTest::Test
   def test_find_user
     user = posix_user_payload
     @ldap.expect(:search, user, [:filter => @ms.name_filter('john'),
-                                 :base   => config.base_dn])
+                                 :base => config.base_dn])
     @ms.ldap = @ldap
     assert_equal posix_user_payload, @ms.find_user('john')
     @ldap.verify
@@ -37,7 +37,7 @@ class TestPosixMemberService < MiniTest::Test
   def test_user_exists
     user = posix_user_payload
     @ldap.expect(:search, user, [:filter => @ms.name_filter('john'),
-                                 :base   => config.base_dn])
+                                 :base => config.base_dn])
     @ms.ldap = @ldap
     assert @ms.find_user('john')
     @ldap.verify
@@ -45,7 +45,7 @@ class TestPosixMemberService < MiniTest::Test
 
   def test_user_doesnt_exists
     @ldap.expect(:search, nil, [:filter => @ms.name_filter('john'),
-                                :base   => config.base_dn])
+                                :base => config.base_dn])
     @ms.ldap = @ldap
     assert_raises(LdapFluff::Posix::MemberService::UIDNotFoundException) { @ms.find_user('john') }
     @ldap.verify
@@ -54,7 +54,7 @@ class TestPosixMemberService < MiniTest::Test
   def test_group_exists
     group = posix_group_payload
     @ldap.expect(:search, group, [:filter => @ms.group_filter('broze'),
-                                  :base   => config.group_base])
+                                  :base => config.group_base])
     @ms.ldap = @ldap
     assert @ms.find_group('broze')
     @ldap.verify
@@ -62,7 +62,7 @@ class TestPosixMemberService < MiniTest::Test
 
   def test_group_doesnt_exists
     @ldap.expect(:search, nil, [:filter => @ms.group_filter('broze'),
-                                :base   => config.group_base])
+                                :base => config.group_base])
     @ms.ldap = @ldap
     assert_raises(LdapFluff::Posix::MemberService::GIDNotFoundException) { @ms.find_group('broze') }
     @ldap.verify

data/test/posix_netgroup_member_services_test.rb

@@ -12,7 +12,7 @@ class TestPosixNetgroupMemberService < MiniTest::Test
   def test_find_user
     user = posix_user_payload
     @ldap.expect(:search, user, [:filter => @ms.name_filter('john'),
-                                 :base   => config.base_dn])
+                                 :base => config.base_dn])
     @ms.ldap = @ldap
     assert_equal posix_user_payload, @ms.find_user('john')
     @ldap.verify
@@ -41,7 +41,7 @@ class TestPosixNetgroupMemberService < MiniTest::Test
   def test_user_exists
     user = posix_user_payload
     @ldap.expect(:search, user, [:filter => @ms.name_filter('john'),
-                                 :base   => config.base_dn])
+                                 :base => config.base_dn])
     @ms.ldap = @ldap
     assert @ms.find_user('john')
     @ldap.verify
@@ -49,7 +49,7 @@ class TestPosixNetgroupMemberService < MiniTest::Test
 
   def test_user_doesnt_exists
     @ldap.expect(:search, nil, [:filter => @ms.name_filter('john'),
-                                :base   => config.base_dn])
+                                :base => config.base_dn])
     @ms.ldap = @ldap
     assert_raises(LdapFluff::Posix::MemberService::UIDNotFoundException) { @ms.find_user('john') }
     @ldap.verify
@@ -58,7 +58,7 @@ class TestPosixNetgroupMemberService < MiniTest::Test
   def test_group_exists
     group = posix_netgroup_payload('broze')
     @ldap.expect(:search, group, [:filter => @ms.group_filter('broze'),
-                                  :base   => config.group_base])
+                                  :base => config.group_base])
     @ms.ldap = @ldap
     assert @ms.find_group('broze')
     @ldap.verify
@@ -66,7 +66,7 @@ class TestPosixNetgroupMemberService < MiniTest::Test
 
   def test_group_doesnt_exists
     @ldap.expect(:search, nil, [:filter => @ms.group_filter('broze'),
-                                :base   => config.group_base])
+                                :base => config.group_base])
     @ms.ldap = @ldap
     assert_raises(LdapFluff::Posix::MemberService::GIDNotFoundException) { @ms.find_group('broze') }
     @ldap.verify

data/test/posix_test.rb

@@ -16,12 +16,12 @@ class TestPosix < MiniTest::Test
   def test_groups
     service_bind
     basic_user
-    assert_equal(@posix.groups_for_uid("john"), %w(bros))
+    assert_equal(@posix.groups_for_uid("john"), %w[bros])
   end
 
   def test_missing_user
     md = MiniTest::Mock.new
-    md.expect(:find_user_groups, [], %w(john))
+    md.expect(:find_user_groups, [], %w[john])
     @posix.member_service = md
     assert_equal([], @posix.groups_for_uid('john'))
   end
@@ -29,13 +29,13 @@ class TestPosix < MiniTest::Test
   def test_isnt_in_groups
     service_bind
     basic_user
-    assert_equal(@posix.is_in_groups('john', %w(broskies), true), false)
+    assert_equal(@posix.is_in_groups('john', %w[broskies], true), false)
   end
 
   def test_is_in_groups
     service_bind
     basic_user
-    assert_equal(@posix.is_in_groups('john', %w(bros), true), true)
+    assert_equal(@posix.is_in_groups('john', %w[bros], true), true)
   end
 
   def test_is_in_no_groups
@@ -49,7 +49,7 @@ class TestPosix < MiniTest::Test
     @md = MiniTest::Mock.new
     user_result = MiniTest::Mock.new
     user_result.expect(:dn, 'uid=internet,dn=example')
-    @md.expect(:find_user, [user_result], %w(internet))
+    @md.expect(:find_user, [user_result], %w[internet])
     @posix.member_service = @md
     service_bind
     @ldap.expect(:auth, nil, %w[uid=internet,dn=example password])
@@ -76,7 +76,7 @@ class TestPosix < MiniTest::Test
   def test_user_exists
     service_bind
     md = MiniTest::Mock.new
-    md.expect(:find_user, 'notnilluser', %w(john))
+    md.expect(:find_user, 'notnilluser', %w[john])
     @posix.member_service = md
     assert(@posix.user_exists?('john'))
   end
@@ -84,8 +84,8 @@ class TestPosix < MiniTest::Test
   def test_missing_user
     service_bind
     md = MiniTest::Mock.new
-    md.expect(:find_user, nil, %w(john))
-    def md.find_user(uid)
+    md.expect(:find_user, nil, %w[john])
+    def md.find_user(_uid)
       raise LdapFluff::Posix::MemberService::UIDNotFoundException
     end
     @posix.member_service = md
@@ -95,7 +95,7 @@ class TestPosix < MiniTest::Test
   def test_group_exists
     service_bind
     md = MiniTest::Mock.new
-    md.expect(:find_group, 'notnillgroup', %w(broskies))
+    md.expect(:find_group, 'notnillgroup', %w[broskies])
     @posix.member_service = md
     assert(@posix.group_exists?('broskies'))
   end
@@ -103,8 +103,8 @@ class TestPosix < MiniTest::Test
   def test_missing_group
     service_bind
     md = MiniTest::Mock.new
-    md.expect(:find_group, nil, %w(broskies))
-    def md.find_group(uid)
+    md.expect(:find_group, nil, %w[broskies])
+    def md.find_group(_uid)
       raise LdapFluff::Posix::MemberService::GIDNotFoundException
     end
     @posix.member_service = md
@@ -119,12 +119,12 @@ class TestPosix < MiniTest::Test
     nested_group[:memberuid] = ['testuser']
 
     @ldap.expect(:search,
-                 [nested_group],
-                 [{ :base   => group.dn,
-                    :filter => Net::LDAP::Filter.eq('objectClass', 'posixGroup') |
-                               Net::LDAP::Filter.eq('objectClass', 'organizationalunit') |
-                               Net::LDAP::Filter.eq('objectClass', 'groupOfUniqueNames') |
-                               Net::LDAP::Filter.eq('objectClass', 'groupOfNames')}])
+      [nested_group],
+      [{ :base => group.dn,
+         :filter => Net::LDAP::Filter.eq('objectClass', 'posixGroup') |
+                    Net::LDAP::Filter.eq('objectClass', 'organizationalunit') |
+                    Net::LDAP::Filter.eq('objectClass', 'groupOfUniqueNames') |
+                    Net::LDAP::Filter.eq('objectClass', 'groupOfNames')}])
     @posix.ldap = @ldap
 
     md = MiniTest::Mock.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap_fluff
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jordan O'Mara
@@ -13,38 +13,38 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,7 +58,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,19 +131,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: LDAP querying tools for Active Directory, FreeIPA and POSIX-style
 test_files:
-- test/ad_member_services_test.rb
+- test/lib/ldap_test_helper.rb
 - test/ad_test.rb
 - test/config_test.rb
 - test/ipa_member_services_test.rb
 - test/ipa_netgroup_member_services_test.rb
 - test/ipa_test.rb
 - test/ldap_test.rb
-- test/lib/ldap_test_helper.rb
 - test/posix_member_services_test.rb
 - test/posix_netgroup_member_services_test.rb
 - test/posix_test.rb
+- test/ad_member_services_test.rb