activeldap 5.2.3 → 6.0.3

data/test/enable-start-tls.ldif

@@ -1,6 +1,6 @@
 # Your LDAP server needs to support StartTLS when you test StartTLS related
 # feature. This is a LDIF file for OpenLDAP to do the configuration.
-# You can use this file by the following command linne on Debian GNU/Linux
+# You can use this file by the following command line on Debian GNU/Linux
 # or Ubuntu:
 #
 #   % sudo usermod -a -G ssl-cert openldap

data/test/run-test.rb

@@ -2,8 +2,6 @@
 
 $VERBOSE = true
 
-$KCODE = 'u' if RUBY_VERSION < "1.9"
-
 base_dir = File.expand_path(File.dirname(__FILE__))
 top_dir = File.expand_path(File.join(base_dir, ".."))
 lib_dir = File.join(top_dir, "lib")
@@ -11,11 +9,9 @@ test_dir = File.join(top_dir, "test")
 $LOAD_PATH.unshift(lib_dir)
 $LOAD_PATH.unshift(test_dir)
 
-require "rubygems"
 require "bundler/setup"
 
 require "test/unit"
-require "test/unit/notify"
 Test::Unit::Priority.enable
 
 Dir.glob(File.join(test_dir, "**", "test_*.rb")) do |test_file|

data/test/test_base.rb

@@ -5,7 +5,52 @@ require 'al-test-utils'
 class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
+  sub_test_case("follow_referrals") do
+    def test_default
+      make_temporary_user do |user1,|
+        make_temporary_user do |user2,|
+          member_url = ["ldap:///#{user1.base.to_s}??one?(objectClass=person)"]
+          make_temporary_group_of_urls(member_url: member_url) do |group_of_urls|
+            assert_equal([user1.dn, user2.dn],
+                         group_of_urls.attributes["member"])
+          end
+        end
+      end
+    end
+
+    def test_connection_false
+      omit_unless_jruby
+      @group_of_urls_class.setup_connection(
+        current_configuration.merge(follow_referrals: false)
+      )
+      make_temporary_user do |user1,|
+        make_temporary_user do |user2,|
+          member_url = ["ldap:///#{user1.base.to_s}??one?(objectClass=person)"]
+          make_temporary_group_of_urls(member_url: member_url) do |group_of_urls|
+            assert_nil(group_of_urls.attributes["member"])
+          end
+        end
+      end
+    end
+
+    def test_connect_false
+      omit_unless_jruby
+      connection = @group_of_urls_class.connection
+      connection.disconnect!
+      connection.connect(follow_referrals: false)
+      make_temporary_user do |user1,|
+        make_temporary_user do |user2,|
+          member_url = ["ldap:///#{user1.base.to_s}??one?(objectClass=person)"]
+          make_temporary_group_of_urls(member_url: member_url) do |group_of_urls|
+            assert_nil(group_of_urls.attributes["member"])
+          end
+        end
+      end
+    end
+  end
+
   priority :must
+  priority :normal
   def test_search_colon_value
     make_temporary_group(:cn => "temp:group") do |group|
       assert_equal("temp:group", group.cn)
@@ -13,7 +58,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_lower_case_object_class
     fixture_file = fixture("lower_case_object_class_schema.rb")
     schema_entries = eval(File.read(fixture_file))
@@ -122,9 +166,9 @@ class TestBase < Test::Unit::TestCase
 
   def test_operational_attributes
     make_temporary_group do |group|
-      dn, attributes = @group_class.search(:attributes => ["*"])[0]
+      _dn, attributes = @group_class.search(:attributes => ["*"])[0]
       normal_attributes = attributes.keys
-      dn, attributes = @group_class.search(:attributes => ["*", "+"])[0]
+      _dn, attributes = @group_class.search(:attributes => ["*", "+"])[0]
       operational_attributes = attributes.keys - normal_attributes
       operational_attribute = operational_attributes[0]
 
@@ -150,13 +194,13 @@ class TestBase < Test::Unit::TestCase
     _ou_class.create("root2")
     assert_equal(["base",
                   "root1", "child1", "child2", "domain", "child3",
-                  "root2"],
-                 _entry_class.find(:all).collect(&:id))
+                  "root2"].sort,
+                 _entry_class.find(:all).collect(&:id).sort)
     assert_raise(ActiveLdap::DeleteError) do
       root1.destroy_all
     end
-    assert_equal(["base", "root1", "domain", "root2"],
-                 _entry_class.find(:all).collect(&:id))
+    assert_equal(["base", "root1", "domain", "root2"].sort,
+                 _entry_class.find(:all).collect(&:id).sort)
   end
 
   def test_delete_mixed_tree_by_instance
@@ -173,13 +217,13 @@ class TestBase < Test::Unit::TestCase
     _ou_class.create("root2")
     assert_equal(["base",
                   "root1", "child1", "child2", "domain", "child3",
-                  "root2"],
-                 _entry_class.find(:all).collect(&:id))
+                  "root2"].sort,
+                 _entry_class.find(:all).collect(&:id).sort)
     assert_raise(ActiveLdap::DeleteError) do
       root1.delete_all
     end
-    assert_equal(["base", "root1", "domain", "root2"],
-                 _entry_class.find(:all).collect(&:id))
+    assert_equal(["base", "root1", "domain", "root2"].sort,
+                 _entry_class.find(:all).collect(&:id).sort)
   end
 
   def test_delete_tree
@@ -189,8 +233,8 @@ class TestBase < Test::Unit::TestCase
     _ou_class.create(:ou => "child1", :parent => root1)
     _ou_class.create(:ou => "child2", :parent => root1)
     _ou_class.create("root2")
-    assert_equal(["base", "root1", "child1", "child2", "root2"],
-                 _ou_class.find(:all).collect(&:ou))
+    assert_equal(["base", "root1", "child1", "child2", "root2"].sort,
+                 _ou_class.find(:all).collect(&:ou).sort)
     _ou_class.delete_all(:base => root1.dn)
     assert_equal(["base", "root2"],
                  _ou_class.find(:all).collect(&:ou))
@@ -217,11 +261,11 @@ class TestBase < Test::Unit::TestCase
                              :classes => ["top"]
     entry_class.dn_attribute = nil
     assert_equal(["base", "root1", "child1", "domain1", "grandchild1",
-                  "child2", "domain2", "root2"],
-                 entry_class.find(:all).collect(&:id))
+                  "child2", "domain2", "root2"].sort,
+                 entry_class.find(:all).collect(&:id).sort)
     entry_class.delete_all(nil, :base => child2.dn)
-    assert_equal(["base", "root1", "child1", "domain1", "grandchild1", "root2"],
-                 entry_class.find(:all).collect(&:id))
+    assert_equal(["base", "root1", "child1", "domain1", "grandchild1", "root2"].sort,
+                 entry_class.find(:all).collect(&:id).sort)
   end
 
   def test_first
@@ -383,6 +427,19 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  def test_set_dn_with_unnormalized_dn_attribute_with_forward_slash
+    make_temporary_user do |user,|
+      new_dn = "uid=temp/user1,#{user.class.base}"
+      assert_not_equal(user.dn.to_s, new_dn)
+
+      user.uid = 'temp/user1'
+      assert_equal(user.dn.to_s, new_dn)
+
+      assert_true(user.save!)
+      assert_true(user.class.find(user.uid).update_attributes!(gidNumber: 100069))
+    end
+  end
+
   def test_destroy_with_empty_base_and_prefix_of_class
     make_temporary_user do |user,|
       base = user.class.base
@@ -945,7 +1002,8 @@ class TestBase < Test::Unit::TestCase
     ou_class.ldap_mapping(:dn_attribute => :ou,
                           :prefix => "",
                           :classes => ["top", "organizationalUnit"])
-    assert_equal(["ou=Groups,#{current_configuration['base']}",
+    assert_equal(["ou=GroupOfURLsSet,#{current_configuration['base']}",
+                  "ou=Groups,#{current_configuration['base']}",
                   "ou=Users,#{current_configuration['base']}"],
                  ou_class.find(:all).collect(&:dn).collect(&:to_s).sort)
   end

data/test/test_base_per_instance.rb

@@ -9,13 +9,45 @@ class TestBasePerInstance < Test::Unit::TestCase
   end
 
   priority :must
+  def test_dn_with_sub_base_first
+    sub_user = @user_class.new(dn: "uid=user1,ou=Sub,#{@user_class.base}",
+                               uid: "user1")
+    # Order is important. #base should be called before #dn.
+    base = sub_user.base.to_s
+    dn = sub_user.dn.to_s
+    assert_equal([
+                   "ou=Sub,#{@user_class.base}",
+                   "uid=user1,ou=Sub,#{@user_class.base}",
+                 ],
+                 [
+                   base,
+                   dn,
+                 ])
+  end
+
+  def test_dn_with_sub_base_last
+    sub_user = @user_class.new(uid: "user1",
+                               dn: "uid=user1,ou=Sub,#{@user_class.base}")
+    # Order is important. #base should be called before #dn.
+    base = sub_user.base.to_s
+    dn = sub_user.dn.to_s
+    assert_equal([
+                   "ou=Sub,#{@user_class.base}",
+                   "uid=user1,ou=Sub,#{@user_class.base}",
+                 ],
+                 [
+                   base,
+                   dn,
+                 ])
+  end
+
+  priority :normal
   def test_set_base
     guest = @user_class.new("guest")
     guest.base = "ou=Sub"
     assert_equal("uid=guest,ou=Sub,#{@user_class.base}", guest.dn)
   end
 
-  priority :normal
   def test_dn_is_base
     entry_class = Class.new(ActiveLdap::Base)
     entry_class.ldap_mapping :prefix => "",

data/test/test_connection.rb

@@ -3,6 +3,7 @@ require 'al-test-utils'
 class TestConnection < Test::Unit::TestCase
   include AlTestUtils::Config
   include AlTestUtils::MockLogger
+  include AlTestUtils::Omittable
 
   def setup
     super
@@ -23,6 +24,9 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_retry_limit_0_with_nonexistent_host_with_timeout
+    omit_if_ldap("this test will take a long time...")
+    omit_if_jruby("JNI adapter returns connection error immediately. " +
+                  "So timeout isn't invoked.")
     config = current_configuration.merge("host" => "192.168.29.29",
                                          "retry_limit" => 0,
                                          "timeout" => 1)

data/test/test_entry.rb

@@ -11,6 +11,7 @@ class TestEntry < Test::Unit::TestCase
         all_entries = [ActiveLdap::Base.base]
         all_entries += [user.dn, user.base]
         all_entries += [group.dn, group.base]
+        all_entries += [@group_of_urls_class.base]
         assert_equal(all_entries.sort,
                      ActiveLdap::Entry.all.collect(&:dn).sort)
       end

data/test/test_find.rb

@@ -3,7 +3,18 @@ require 'al-test-utils'
 class TestFind < Test::Unit::TestCase
   include AlTestUtils
 
-  priority :must
+  def test_find_paged
+    page_size = 126
+    n_users = page_size + 1
+    uids = n_users.times.collect do
+      user, _password = make_temporary_user
+      user.uid
+    end
+    users = @user_class.find(:all, page_size: page_size)
+    assert_equal(uids.sort,
+                 users.collect(&:uid).sort)
+  end
+
   def test_find_with_dn
     make_temporary_user do |user,|
       assert_equal(user.dn, @user_class.find(user.dn).dn)
@@ -11,7 +22,6 @@ class TestFind < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_find_with_special_value_prefix
     # \2C == ','
     make_ou("a\\2Cb,ou=Users")

data/test/test_supported_control.rb

@@ -17,7 +17,7 @@ class TestSupportedControl < Test::Unit::TestCase
     end
 
     def test_false
-      assert_true(paged_results?(ActiveLdap::LdapControls::PAGED_RESULTS))
+      assert_false(paged_results?(ActiveLdap::LdapControls::ASSERTION))
     end
   end
 end

data/test/test_validation.rb

@@ -37,6 +37,15 @@ class TestValidation < Test::Unit::TestCase
   priority :must
 
   priority :normal
+  def test_validate_false
+    make_temporary_user(:simple => true) do |user,|
+      user.sn = nil
+      assert_raise(ActiveLdap::RequiredAttributeMissed) do
+        user.save(validate: false)
+      end
+    end
+  end
+
   def test_octet_string
     make_temporary_user(:simple => true) do |user,|
       utf8_encoded_binary_value = "\xff".force_encoding("UTF-8")
@@ -52,8 +61,8 @@ class TestValidation < Test::Unit::TestCase
         user1.id = user2.id
         assert_false(user1.save)
 
-        format = la_('distinguishedName').humanize
-        format  << ' ' << _("is duplicated: %s")
+        format = human_attribute_name("distinguishedName")
+        format << " " << _("is duplicated: %s")
         assert_equal([format % [user2.dn.to_s]],
                      user1.errors.full_messages)
       end
@@ -66,8 +75,8 @@ class TestValidation < Test::Unit::TestCase
       user.jpeg_photo = "XXX"
       assert_not_predicate(user, :save)
 
-      format = la_('jpegPhoto').humanize
-      format << ' '  << _("has invalid format: %s: required syntax: %s: %s")
+      format = human_attribute_name('jpegPhoto')
+      format << " "  << _("has invalid format: %s: required syntax: %s: %s")
       arguments = [_("<binary-value>"),
                    lsd_("1.3.6.1.4.1.1466.115.121.1.28"),
                    _("invalid JPEG format")]
@@ -112,8 +121,8 @@ class TestValidation < Test::Unit::TestCase
     reason = _("attribute value is missing")
     invalid_format = _("%s is invalid distinguished name (DN): %s")
     invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
-    format = la_('distinguishedName').humanize
-    format << ' ' << _("is invalid: %s")
+    format = human_attribute_name("distinguishedName")
+    format << " " << _("is invalid: %s")
     message = format % invalid_message
     assert_equal([message],
                  user.errors.full_messages.find_all {|m| /DN/ =~ m})
@@ -126,8 +135,8 @@ class TestValidation < Test::Unit::TestCase
       reason = _("attribute value is missing")
       invalid_format = _("%s is invalid distinguished name (DN): %s")
       invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
-      format = la_('distinguishedName').humanize
-      format << ' ' << _("is invalid: %s")
+      format = human_attribute_name("distinguishedName")
+      format << " " << _("is invalid: %s")
       message = format % invalid_message
       assert_equal([message], user.errors.full_messages)
     end
@@ -138,8 +147,8 @@ class TestValidation < Test::Unit::TestCase
       assert(user.valid?)
       user.uid_number = ""
       assert(!user.valid?)
-      format = la_('uidNumber').humanize
-      format << ' ' << _("is required attribute by objectClass '%s'")
+      format = human_attribute_name("uidNumber")
+      format << " " << _("is required attribute by objectClass '%s'")
       blank_message = format % loc_("posixAccount")
       assert_equal([blank_message], user.errors.full_messages)
     end
@@ -150,8 +159,8 @@ class TestValidation < Test::Unit::TestCase
       assert(user.save)
       user.class.excluded_classes = ['person']
       assert(!user.save)
-      format = la_("objectClass").humanize
-      format << ' ' << n_("has excluded value: %s",
+      format = human_attribute_name("objectClass")
+      format << " " << n_("has excluded value: %s",
                           "has excluded values: %s",
                           1)
       message = format % loc_("person")
@@ -222,8 +231,8 @@ class TestValidation < Test::Unit::TestCase
     assert(ou_class.new("YYY").save)
     ou = ou_class.new("YYY")
     assert(!ou.save)
-    format = la_("distinguishedName").humanize
-    format << ' ' << _("is duplicated: %s")
+    format = human_attribute_name("distinguishedName")
+    format << " " << _("is duplicated: %s")
     message = format % ou.dn
     assert_equal([message], ou.errors.full_messages)
   end
@@ -259,12 +268,16 @@ class TestValidation < Test::Unit::TestCase
   end
 
   private
+  def human_attribute_name(name)
+    la_(name).dup
+  end
+
   def assert_invalid_value(name, formatted_value, syntax, reason, model, option)
     syntax_description = lsd_(syntax)
     assert_not_nil(syntax_description)
     params = [formatted_value, syntax_description, reason]
     params.unshift(option) if option
-    localized_name = la_(name).humanize
+    localized_name = human_attribute_name(name)
     format = localized_name << ' '
     if option
       format << _("(%s) has invalid format: %s: required syntax: %s: %s")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 6.0.3
 platform: ruby
 authors:
 - Will Drewry
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,21 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,16 +182,15 @@ files:
 - COPYING
 - Gemfile
 - LICENSE
-- README.textile
 - TODO
 - benchmark/README.md
 - benchmark/bench-backend.rb
 - benchmark/bench-instantiate.rb
 - benchmark/config.yaml.sample
-- doc/text/development.textile
-- doc/text/news.textile
-- doc/text/rails.textile
-- doc/text/tutorial.textile
+- doc/text/development.md
+- doc/text/news.md
+- doc/text/rails.md
+- doc/text/tutorial.md
 - examples/config.yaml.example
 - examples/example.der
 - examples/example.jpg
@@ -294,6 +279,7 @@ files:
 - test/al-test-utils.rb
 - test/command.rb
 - test/config.yaml.sample
+- test/enable-dynamic-groups.ldif
 - test/enable-start-tls.ldif
 - test/fixtures/lower_case_object_class_schema.rb
 - test/run-test.rb
@@ -359,8 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ruby-activeldap
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
@@ -369,6 +354,7 @@ test_files:
 - test/al-test-utils.rb
 - test/command.rb
 - test/config.yaml.sample
+- test/enable-dynamic-groups.ldif
 - test/enable-start-tls.ldif
 - test/fixtures/lower_case_object_class_schema.rb
 - test/run-test.rb