activeldap 1.1.0 → 1.2.0

data/test/test_acts_as_tree.rb

@@ -17,7 +17,8 @@ class TestActsAsTree < Test::Unit::TestCase
     users = ou_class.find("Users")
     assert_equal(["SubUsers"], users.children.collect(&:ou))
 
-    assert_equal("ou=SubUsers,#{users.dn}", sub_users.dn)
+    assert_equal(dn("ou=SubUsers,#{users.dn}"),
+                 sub_users.dn)
 
     assert(ou_class.exists?("SubUsers"))
     users.children.replace([])
@@ -31,7 +32,8 @@ class TestActsAsTree < Test::Unit::TestCase
 
     sub_users = users.class.new("SubUsers")
     sub_users.parent = users
-    assert_equal("ou=SubUsers,#{users.dn}", sub_users.dn)
+    assert_equal(dn("ou=SubUsers,#{users.dn}"),
+                 sub_users.dn)
     assert_equal(["SubUsers"], users.children.collect(&:ou))
 
     sub_users = ou_class.find("SubUsers")
@@ -46,7 +48,8 @@ class TestActsAsTree < Test::Unit::TestCase
     assert_equal([], other_users.children.collect(&:ou))
 
     sub_users.parent = other_users.dn
-    assert_equal("ou=SubUsers,#{other_users.dn}", sub_users.dn)
+    assert_equal(dn("ou=SubUsers,#{other_users.dn}"),
+                 sub_users.dn)
 
     other_users.clear_association_cache
     assert_equal(["SubUsers"], other_users.children.collect(&:ou))

data/test/test_associations.rb

@@ -96,13 +96,14 @@ EOX
       make_temporary_group do |group1|
         make_temporary_group do |group2|
           user.references = [group1, group2]
-          group3_dn = group2.dn.sub(/cn=(.*?),/, "cn=\\1-nonexistent,")
+          group3_dn = group2.dn.to_s.sub(/cn=(.*?),/, "cn=\\1-nonexistent,")
           user.see_also += [group3_dn]
           user.save!
 
+          group3_dn = dn(group3_dn)
           user = @user_class.find(user.dn)
           assert_equal([group1.dn, group2.dn, group3_dn],
-                       user.see_also.collect(&:to_s))
+                       user.see_also)
           assert_equal([group1.dn, group2.dn, group3_dn],
                        user.references.collect(&:dn))
           assert_equal([group1.gid_number, group2.gid_number, nil],

data/test/test_base.rb

@@ -6,6 +6,106 @@ class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_rename_with_superior
+    make_ou("sub,ou=users")
+    make_temporary_user(:simple => true) do |user,|
+      user.id = "user2,ou=sub,#{@user_class.base}"
+      assert_raise(ActiveLdap::NotImplemented) do
+        assert_true(user.save)
+
+        # the following codes aren't reached for now. :<
+        found_user = nil
+        assert_nothing_raised do
+          found_user = @user_class.find("user2")
+        end
+        base = @user_class.base
+        assert_equal("#{@user_class.dn_attribute}=user2,ou=sub,#{base}",
+                     found_user.dn.to_s)
+      end
+    end
+  end
+
+  def test_rename
+    make_temporary_user(:simple => true) do |user,|
+      assert_not_equal("user2", user.id)
+      assert_raise(ActiveLdap::EntryNotFound) do
+        @user_class.find("user2")
+      end
+      user.id = "user2"
+      assert_true(user.save)
+      assert_equal("user2", user.id)
+
+      found_user = nil
+      assert_nothing_raised do
+        found_user = @user_class.find("user2")
+      end
+      assert_equal("user2", found_user.id)
+    end
+  end
+
+  priority :normal
+  def test_operational_attributes
+    make_temporary_group do |group|
+      dn, attributes = @group_class.search(:attributes => ["*"])[0]
+      normal_attributes = attributes.keys
+      dn, attributes = @group_class.search(:attributes => ["*", "+"])[0]
+      operational_attributes = attributes.keys - normal_attributes
+      operational_attribute = operational_attributes[0]
+
+      group = @group_class.find(:first, :attributes => ["*", "+"])
+      operational_attribute_value = group[operational_attribute]
+      assert_not_nil(operational_attribute_value)
+      group.save!
+      assert_equal(operational_attribute_value, group[operational_attribute])
+    end
+  end
+
+  def test_destroy_mixed_tree_by_instance
+    make_ou("base")
+    _entry_class = entry_class("ou=base")
+    _ou_class = ou_class("ou=base")
+    _dc_class = dc_class("ou=base")
+
+    root1 = _ou_class.create("root1")
+    child1 = _ou_class.create(:ou => "child1", :parent => root1)
+    child2 = _ou_class.create(:ou => "child2", :parent => root1)
+    domain = _dc_class.create(:dc => "domain", :o => "domain", :parent => root1)
+    child3 = _ou_class.create(:ou => "child3", :parent => root1)
+    root2 = _ou_class.create("root2")
+    assert_equal(["base",
+                  "root1", "child1", "child2", "domain", "child3",
+                  "root2"],
+                 _entry_class.find(:all).collect(&:id))
+    assert_raise(ActiveLdap::DeleteError) do
+      root1.destroy_all
+    end
+    assert_equal(["base", "root1", "domain", "root2"],
+                 _entry_class.find(:all).collect(&:id))
+  end
+
+  def test_delete_mixed_tree_by_instance
+    make_ou("base")
+    _entry_class = entry_class("ou=base")
+    _ou_class = ou_class("ou=base")
+    _dc_class = dc_class("ou=base")
+
+    root1 = _ou_class.create("root1")
+    child1 = _ou_class.create(:ou => "child1", :parent => root1)
+    child2 = _ou_class.create(:ou => "child2", :parent => root1)
+    domain = _dc_class.create(:dc => "domain", :o => "domain", :parent => root1)
+    child3 = _ou_class.create(:ou => "child3", :parent => root1)
+    root2 = _ou_class.create("root2")
+    assert_equal(["base",
+                  "root1", "child1", "child2", "domain", "child3",
+                  "root2"],
+                 _entry_class.find(:all).collect(&:id))
+    assert_raise(ActiveLdap::DeleteError) do
+      root1.delete_all
+    end
+    assert_equal(["base", "root1", "domain", "root2"],
+                 _entry_class.find(:all).collect(&:id))
+  end
+
   def test_delete_tree
     make_ou("base")
     _ou_class = ou_class("ou=base")
@@ -48,7 +148,6 @@ class TestBase < Test::Unit::TestCase
                  entry_class.find(:all).collect(&:id))
   end
 
-  priority :normal
   def test_first
     make_temporary_user(:simple => true) do |user1,|
       make_temporary_user(:simple => true) do |user2,|
@@ -290,7 +389,7 @@ class TestBase < Test::Unit::TestCase
     make_temporary_user(:uid => "test-user,ou=SUB") do |user, password|
       sub_user_class = Class.new(@user_class)
       sub_user_class.ldap_mapping :prefix => "ou=sub"
-      assert_equal("uid=test-user,ou=sub,#{@user_class.base}",
+      assert_equal(dn("uid=test-user,ou=sub,#{@user_class.base}"),
                    sub_user_class.find(user.uid).dn)
     end
   end
@@ -398,9 +497,9 @@ class TestBase < Test::Unit::TestCase
 
   def test_loose_dn
     make_temporary_user do |user,|
-      assert(user.class.exists?(user.dn))
-      assert(user.class.exists?(user.dn.gsub(/,/, " , ")))
-      assert(user.class.exists?(user.dn.gsub(/=/, " = ")))
+      assert(user.class.exists?(user.dn.to_s))
+      assert(user.class.exists?(user.dn.to_s.gsub(/,/, " , ")))
+      assert(user.class.exists?(user.dn.to_s.gsub(/=/, " = ")))
     end
   end
 

data/test/test_dn.rb

@@ -12,6 +12,12 @@ class TestDN < Test::Unit::TestCase
   end
 
   priority :must
+  def test_parent
+    dn = parse("o=xxx,dc=local,dc=net")
+    assert_equal(parse("dc=local,dc=net"), dn.parent)
+    assert_equal(parse("dc=net"), dn.parent.parent)
+    assert_nil(dn.parent.parent.parent)
+  end
 
   priority :normal
   def test_case_insensitive_dn_minus
@@ -159,4 +165,8 @@ class TestDN < Test::Unit::TestCase
   def assert_dn_to_s(expected, dn)
     assert_equal(expected, ActiveLdap::DN.parse(dn).to_s)
   end
+
+  def parse(dn)
+    ActiveLdap::DN.parse(dn)
+  end
 end

data/test/test_groupls.rb

@@ -7,7 +7,7 @@ class TestGroupls < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "groupls")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_lpasswd.rb

@@ -7,7 +7,7 @@ class TestLPasswd < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "lpasswd")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_reflection.rb

@@ -15,38 +15,28 @@ class TestReflection < Test::Unit::TestCase
 
   def test_respond_to?
     make_temporary_user do |user, password|
-      attributes = (user.must + user.may).collect(&:name)
+      attributes = (user.must + user.may).collect(&:name) - ["objectClass"]
       _wrap_assertion do
         attributes.each do |name|
-          assert(user.respond_to?(name), name)
-          assert(user.respond_to?("#{name}="), "#{name}=")
-          assert(user.respond_to?("#{name}?"), "#{name}?")
-          assert(user.respond_to?("#{name}_before_type_cast"),
-                 "#{name}_before_type_cast")
+          assert_respond_to(user, name)
         end
+        assert_not_respond_to(user, "objectClass")
       end
 
       user.replace_class(user.class.required_classes)
       new_attributes = collect_attributes(user.class.required_classes)
+      new_attributes -= ["objectClass"]
 
       _wrap_assertion do
         assert_not_equal([], new_attributes)
         new_attributes.each do |name|
-          assert(user.respond_to?(name), name)
-          assert(user.respond_to?("#{name}="), "#{name}=")
-          assert(user.respond_to?("#{name}?"), "#{name}?")
-          assert(user.respond_to?("#{name}_before_type_cast"),
-                 "#{name}_before_type_cast")
+          assert_respond_to(user, name)
         end
 
         remained_attributes = (attributes - new_attributes)
         assert_not_equal([], remained_attributes)
         remained_attributes.each do |name|
-          assert(!user.respond_to?(name), name)
-          assert(!user.respond_to?("#{name}="), "#{name}=")
-          assert(!user.respond_to?("#{name}?"), "#{name}?")
-          assert(!user.respond_to?("#{name}_before_type_cast"),
-                 "#{name}_before_type_cast")
+          assert_not_respond_to(user, name)
         end
       end
     end
@@ -135,6 +125,7 @@ class TestReflection < Test::Unit::TestCase
     end
   end
 
+  private
   def assert_methods_with_only_required_classes(object, attributes)
     old_classes = (object.classes - object.class.required_classes).uniq
     old_attributes = collect_attributes(old_classes, false).uniq.sort
@@ -157,6 +148,22 @@ class TestReflection < Test::Unit::TestCase
                    required_attributes)
   end
 
+  def assert_respond_to(object, name)
+    assert_true(object.respond_to?(name), name)
+    assert_true(object.respond_to?("#{name}="), "#{name}=")
+    assert_true(object.respond_to?("#{name}?"), "#{name}?")
+    assert_true(object.respond_to?("#{name}_before_type_cast"),
+                "#{name}_before_type_cast")
+  end
+
+  def assert_not_respond_to(object, name)
+    assert_false(object.respond_to?(name), name)
+    assert_false(object.respond_to?("#{name}="), "#{name}=")
+    assert_false(object.respond_to?("#{name}?"), "#{name}?")
+    assert_false(object.respond_to?("#{name}_before_type_cast"),
+                 "#{name}_before_type_cast")
+  end
+
   def collect_attributes(object_classes, with_aliases=true)
     attributes = []
     object_classes.each do |object_class|

data/test/test_schema.rb

@@ -2,6 +2,29 @@ require 'al-test-utils'
 
 class TestSchema < Test::Unit::TestCase
   priority :must
+  def test_directory_operation
+    attributes_schema =
+      "( 2.5.18.1 NAME 'createTimestamp' " +
+      "DESC 'RFC4512: time which ob ject was created' " +
+      "EQUALITY generalizedTimeMatch " +
+      "ORDERING generalizedTimeOrderingMatch " +
+      "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 " +
+      "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )"
+
+    assert_attribute_type({
+                            :read_only => true,
+                            :single_value => true,
+                            :binary => false,
+                            :binary_required => false,
+                            :directory_operation => true,
+                            :syntax => "1.3.6.1.4.1.1466.115.121.1.24",
+                            :syntax_description => nil,
+                          },
+                          "createTimestamp",
+                          [attributes_schema])
+  end
+
+  priority :normal
   def test_dit_content_rule
     object_class_schema = "( 2.5.6.6 NAME 'person' DESC " +
       "'RFC2256: a person' SUP top STRUCTURAL MUST sn " +
@@ -37,7 +60,6 @@ class TestSchema < Test::Unit::TestCase
                  })
   end
 
-  priority :normal
   def test_oid_list_with_just_only_one_oid
     ou_schema = "( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL MUST " +
       "(ou ) MAY (c $ l $ st $ street $ searchGuide $ businessCategory $ " +
@@ -524,4 +546,14 @@ class TestSchema < Test::Unit::TestCase
     end
     assert_equal(expected, result)
   end
+
+  def assert_attribute_type(expected, name, schemata)
+    group = 'attributeTypes'
+    entry = {group => schemata}
+    schema = ActiveLdap::Schema.new(entry)
+    attribute_hash = schema.attribute(name).to_hash
+    syntax = attribute_hash[:syntax]
+    attribute_hash[:syntax] = syntax.id if syntax
+    assert_equal(expected, attribute_hash)
+  end
 end

data/test/test_useradd-binary.rb

@@ -7,7 +7,7 @@ class TestUseraddBinary < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "useradd-binary")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_useradd.rb

@@ -7,7 +7,7 @@ class TestUseradd < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "useradd")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_userdel.rb

@@ -7,7 +7,7 @@ class TestUserdel < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "userdel")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_userls.rb

@@ -7,7 +7,7 @@ class TestUserls < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "userls")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_usermod-binary-add-time.rb

@@ -7,7 +7,7 @@ class TestUsermodBinaryAddTime < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "usermod-binary-add-time")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_usermod-binary-add.rb

@@ -7,7 +7,7 @@ class TestUsermodBinaryAdd < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "usermod-binary-add")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_usermod-binary-del.rb

@@ -7,7 +7,7 @@ class TestUsermodBinaryDel < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "usermod-binary-del")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_usermod-lang-add.rb

@@ -7,7 +7,7 @@ class TestUsermodLangAdd < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "usermod-lang-add")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_usermod.rb

@@ -7,7 +7,7 @@ class TestUsermod < Test::Unit::TestCase
     super
     @command = File.join(@examples_dir, "usermod")
     make_ou("People")
-    @user_class.instance_variable_set("@prefix", "ou=People")
+    @user_class.prefix = "ou=People"
   end
 
   priority :must

data/test/test_validation.rb

@@ -6,6 +6,51 @@ class TestValidation < Test::Unit::TestCase
   include ActiveLdap::Helper
 
   priority :must
+  def test_rename_duplicated
+    make_temporary_user(:simple => true) do |user1,|
+      make_temporary_user(:simple => true) do |user2,|
+        user1.id = user2.id
+        assert_false(user1.save)
+
+        format = _("%{fn} is duplicated: %s")
+        format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
+        assert_equal([format % [user2.dn.to_s]],
+                     user1.errors.full_messages)
+      end
+    end
+  end
+
+  priority :normal
+  def test_not_show_binary_value
+    make_temporary_user do |user,|
+      user.user_certificate = nil
+      user.jpeg_photo = "XXX"
+      assert_not_predicate(user, :save)
+
+      format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
+      format = format.sub(/^%\{fn\}/, la_('jpegPhoto'))
+      arguments = [_("<binary-value>"),
+                   lsd_("1.3.6.1.4.1.1466.115.121.1.28"),
+                   _("invalid JPEG format")]
+      message = format % arguments
+      assert_equal([message],
+                   user.errors.full_messages)
+    end
+  end
+
+  def test_validation_skip_attributes
+    make_temporary_group do |group|
+      group.gid_number = nil
+      assert_raise(ActiveLdap::EntryInvalid) do
+        group.save!
+      end
+      group.validation_skip_attributes << "gidNumber"
+      assert_raise(ActiveLdap::RequiredAttributeMissed) do
+        group.save!
+      end
+    end
+  end
+
   def test_set_attributes_with_invalid_dn_attribute_value
     user = nil
     assert_nothing_raised do
@@ -14,7 +59,6 @@ class TestValidation < Test::Unit::TestCase
     assert(!user.valid?)
   end
 
-  priority :normal
   def test_set_attribute_to_invalid_dn_attribute_value_object
     user = @user_class.new("=")
     assert_nothing_raised do
@@ -30,7 +74,7 @@ class TestValidation < Test::Unit::TestCase
     invalid_format = _("%s is invalid distinguished name (DN): %s")
     invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
     format = _("%{fn} is invalid: %s")
-    format = format.sub(/^%\{fn\}/, la_('DN'))
+    format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
     message = format % invalid_message
     assert_equal([message],
                  user.errors.full_messages.find_all {|m| /DN/ =~ m})
@@ -44,7 +88,7 @@ class TestValidation < Test::Unit::TestCase
       invalid_format = _("%s is invalid distinguished name (DN): %s")
       invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
       format = _("%{fn} is invalid: %s")
-      format = format.sub(/^%\{fn\}/, la_('DN'))
+      format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
       message = format % invalid_message
       assert_equal([message], user.errors.full_messages)
     end
@@ -142,7 +186,7 @@ class TestValidation < Test::Unit::TestCase
     ou = ou_class.new("YYY")
     assert(!ou.save)
     format = _("%{fn} is duplicated: %s")
-    format = format.sub(/^%\{fn\}/, la_("DN"))
+    format = format.sub(/^%\{fn\}/, la_("distinguishedName"))
     message = format % ou.dn
     assert_equal([message], ou.errors.full_messages)
   end
@@ -156,9 +200,6 @@ class TestValidation < Test::Unit::TestCase
       end
 
       @group_class.validates_presence_of(:description)
-      def @group_class.name
-        "Group"
-      end
       assert_raises(ActiveLdap::EntryInvalid) do
         group.save!
       end
@@ -174,9 +215,6 @@ class TestValidation < Test::Unit::TestCase
       assert_equal([], group.errors.to_a)
 
       @group_class.validates_presence_of(:description)
-      def @group_class.name
-        "Group"
-      end
       assert(!group.valid?)
       assert(group.errors.invalid?(:description))
       assert_equal(1, group.errors.size)