activeldap 1.2.1 → 1.2.2

data/lib/active_ldap/adapter/net_ldap.rb

@@ -73,7 +73,7 @@ module ActiveLdap
           }
           info = {
             :base => base, :scope => scope_name(scope),
-            :filter => filter, :attributes => attrs,
+            :filter => filter, :attributes => attrs, :limit => limit
           }
           execute(:search, info, args) do |entry|
             attributes = {}
@@ -138,7 +138,13 @@ module ActiveLdap
       private
       def execute(method, info=nil, *args, &block)
         name = (info || {}).delete(:name) || method
-        result = log(name, info) {@connection.send(method, *args, &block)}
+        result = log(name, info) do
+          begin
+            @connection.send(method, *args, &block)
+          rescue Errno::EPIPE
+            raise ConnectionError, "#{$!.class}: #{$!.message}"
+          end
+        end
         message = nil
         if result.is_a?(Hash)
           message = result[:errorMessage]
@@ -147,6 +153,7 @@ module ActiveLdap
         unless result.zero?
           klass = LdapError::ERRORS[result]
           klass ||= LdapError
+          return if klass == LdapError::SizeLimitExceeded
           message = [Net::LDAP.result2string(result), message].compact.join(": ")
           raise klass, message
         end

data/lib/active_ldap/association/collection.rb

@@ -40,8 +40,20 @@ module ActiveLdap
 
       def replace(others)
         load_target
-        deleted_entries = @target - others
-        added_entries = others - @target
+
+        entry = @target.first
+        if entry.nil?
+          deleted_entries = []
+          added_entries = others
+        else
+          base_class = entry.class
+          others = others.collect do |other|
+            other = base_class.find(other) unless other.is_a?(base_class)
+            other
+          end
+          deleted_entries = @target - others
+          added_entries = others - @target
+        end
 
         delete(deleted_entries)
         concat(added_entries)

data/lib/active_ldap/base.rb

@@ -588,7 +588,7 @@ module ActiveLdap
           require 'logger'
           @@logger = Logger.new(STDERR)
           @@logger.progname = 'ActiveLdap'
-          @@logger.level = Logger::UNKNOWN
+          @@logger.level = Logger::ERROR
         end
         configuration[:logger] ||= @@logger
       end
@@ -1109,12 +1109,17 @@ module ActiveLdap
       "#{name}: #{values.inspect}"
     end
 
+    def find_object_class_values(data)
+      data["objectClass"] || data["objectclass"]
+    end
+
     def attribute_name_resolvable_without_connection?
       @entry_attribute and @local_entry_attribute
     end
 
     def entry_attribute
-      @entry_attribute ||= connection.entry_attribute(@data["objectClass"] || [])
+      @entry_attribute ||=
+        connection.entry_attribute(find_object_class_values(@data) || [])
     end
 
     def local_entry_attribute
@@ -1240,7 +1245,8 @@ module ActiveLdap
     def get_attribute_before_type_cast(name, force_array=false)
       name = to_real_attribute_name(name)
 
-      value = @data[name] || []
+      value = @data[name]
+      value = [] if value.nil?
       [name, array_of(value, force_array)]
     end
 
@@ -1510,8 +1516,9 @@ module ActiveLdap
 
       oc_value = data['objectClass']
       attributes.push(['objectClass', oc_value])
+      except_keys = ['objectClass', dn_attr].collect(&:downcase)
       data.each do |key, value|
-        next if key == 'objectClass' or key == dn_attr
+        next if except_keys.include?(key.downcase)
         value = self.class.remove_blank_value(value)
         next if self.class.blank_value?(value)
 
@@ -1532,8 +1539,9 @@ module ActiveLdap
       ldap_data = normalize_data(@ldap_data)
 
       # Expand subtypes to real data attributes, but leave @data alone
+      object_classes = find_object_class_values(@ldap_data) || []
       original_attributes =
-        connection.entry_attribute(@ldap_data["objectClass"] || []).names
+        connection.entry_attribute(object_classes).names
       bad_attrs = original_attributes - entry_attribute.names
       data = normalize_data(@data, bad_attrs)
 

data/lib/active_ldap/configuration.rb

@@ -33,6 +33,7 @@ module ActiveLdap
     DEFAULT_CONFIG[:allow_anonymous] = true
     DEFAULT_CONFIG[:sasl_quiet] = true
     DEFAULT_CONFIG[:try_sasl] = false
+    DEFAULT_CONFIG[:sasl_options] = nil
     # See http://www.iana.org/assignments/sasl-mechanisms
     DEFAULT_CONFIG[:sasl_mechanisms] = ["GSSAPI", "DIGEST-MD5",
                                         "CRAM-MD5", "EXTERNAL"]

data/lib/active_ldap/ldap_error.rb

@@ -20,8 +20,8 @@ EOC
       0x00 => "SUCCESS",
       0x01 => "OPERATIONS_ERROR",
       0x02 => "PROTOCOL_ERROR",
-      0x03 => "TIMELIMIT_EXCEEDED",
-      0x04 => "SIZELIMIT_EXCEEDED",
+      0x03 => "TIME_LIMIT_EXCEEDED",
+      0x04 => "SIZE_LIMIT_EXCEEDED",
       0x05 => "COMPARE_FALSE",
       0x06 => "COMPARE_TRUE",
       0x07 => "AUTH_METHOD_NOT_SUPPORTED",
@@ -29,7 +29,7 @@ EOC
       0x09 => "PARTIAL_RESULTS", # LDAPv2+ (not LDAPv3)
 
       0x0a => "REFERRAL",
-      0x0b => "ADMINLIMIT_EXCEEDED",
+      0x0b => "ADMIN_LIMIT_EXCEEDED",
       0x0c => "UNAVAILABLE_CRITICAL_EXTENSION",
       0x0d => "CONFIDENTIALITY_REQUIRED",
       0x0e => "LDAP_SASL_BIND_IN_PROGRESS",

data/lib/active_ldap/ldif.rb

@@ -46,7 +46,7 @@ module ActiveLdap
         return "#{name}:\n" if value.blank?
         result = "#{name}:"
 
-        value = value.to_s if value.is_a?(DN)
+        value = value.to_s unless value.is_a?(String)
         if value[-1, 1] == ' ' or binary_value?(value)
           result << ":"
           value = [value].pack("m").gsub(/\n/, '')

data/lib/active_ldap/operations.rb

@@ -83,6 +83,7 @@ module ActiveLdap
           :attribute => attr,
           :value => value,
           :prefix => prefix,
+          :limit => 1,
         }
 
         attribute = attr || ensure_search_attribute
@@ -90,6 +91,7 @@ module ActiveLdap
           :attribute => attr,
           :value => value,
           :prefix => ["#{attribute}=#{value}", prefix].compact.join(","),
+          :limit => 1,
           :scope => :base,
         }
 

data/lib/active_ldap/schema/syntaxes.rb

@@ -91,9 +91,9 @@ module ActiveLdap
 
         def normalize_value(value)
           case value
-          when true
+          when true, "1"
             "TRUE"
-          when false
+          when false, "0"
             "FALSE"
           else
             value

data/lib/active_ldap/validations.rb

@@ -87,6 +87,20 @@ module ActiveLdap
     end
 
     private
+    def format_validation_message(format, parameters)
+      if ActiveLdap.get_text_supported?
+        if /\A(%\{fn\})/ =~ format
+          place_holder = $1
+          format = $POSTMATCH
+        else
+          place_holder = ""
+        end
+        "#{place_holder}#{format % parameters}"
+      else
+        format.sub(/\A%\{fn\} ?/, '') % parameters
+      end
+    end
+
     def validate_duplicated_dn_creation
       _dn = nil
       begin
@@ -96,10 +110,8 @@ module ActiveLdap
       end
       if _dn and exist?
         format = _("%{fn} is duplicated: %s")
-        unless ActiveLdap.get_text_supported?
-          format = format.sub(/^%\{fn\} /, '')
-        end
-        errors.add("distinguishedName", format % _dn)
+        message = format_validation_message(format, _dn)
+        errors.add("distinguishedName", message)
       end
     end
 
@@ -118,10 +130,8 @@ module ActiveLdap
       end
       if _dn and exist?
         format = _("%{fn} is duplicated: %s")
-        unless ActiveLdap.get_text_supported?
-          format = format.sub(/^%\{fn\} /, '')
-        end
-        errors.add("distinguishedName", format % _dn)
+        message = format_validation_message(format, _dn)
+        errors.add("distinguishedName", message)
       end
     end
 
@@ -129,23 +139,28 @@ module ActiveLdap
       dn
     rescue DistinguishedNameInvalid
       format = _("%{fn} is invalid: %s")
-      format = format.sub(/^%\{fn\} /, '') unless ActiveLdap.get_text_supported?
-      errors.add("distinguishedName", format % $!.message)
+      message = format_validation_message(format, $!.message)
+      errors.add("distinguishedName", message)
     rescue DistinguishedNameNotSetError
       format = _("%{fn} isn't set: %s")
-      format = format.sub(/^%\{fn\} /, '') unless ActiveLdap.get_text_supported?
-      errors.add("distinguishedName", format % $!.message)
+      message = format_validation_message(format, $!.message)
+      errors.add("distinguishedName", message)
     end
 
     def validate_excluded_classes
-      return if self.class.excluded_classes.empty?
+      excluded_classes = self.class.excluded_classes
+      return if excluded_classes.empty?
 
       _schema = schema
-      unexpected_classes = self.class.excluded_classes.collect do |name|
+      _classes = classes.collect do |name|
         _schema.object_class(name)
       end
-      unexpected_classes -= classes.collect do |name|
-        _schema.object_class(name)
+      unexpected_classes = excluded_classes.inject([]) do |classes, name|
+        excluded_class = _schema.object_class(name)
+        if _classes.include?(excluded_class)
+          classes << excluded_class
+        end
+        classes
       end
       return if unexpected_classes.empty?
 
@@ -155,8 +170,8 @@ module ActiveLdap
       format = n_("%{fn} has excluded value: %s",
                   "%{fn} has excluded values: %s",
                   names.size)
-      format = format.sub(/^%\{fn\} /, '') unless ActiveLdap.get_text_supported?
-      errors.add("objectClass", format % names.join(", "))
+      message = format_validation_message(format, names.join(", "))
+      errors.add("objectClass", message)
     end
 
     # validate_required_ldap_values
@@ -195,10 +210,8 @@ module ActiveLdap
                        "'%s': aliases: %s")
             args << aliases.join(', ')
           end
-          unless ActiveLdap.get_text_supported?
-            format = format.sub(/^%\{fn\} /, '')
-          end
-          errors.add(real_name, format % args)
+          message = format_validation_message(format, args)
+          errors.add(real_name, message)
         end
       end
     end
@@ -228,10 +241,8 @@ module ActiveLdap
         format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
       end
       params.unshift(option) if option
-      unless ActiveLdap.get_text_supported?
-        format = format.sub(/^%\{fn\} ?/, '')
-      end
-      errors.add(name, format % params)
+      message = format_validation_message(format, params)
+      errors.add(name, message)
     end
   end
 end

data/lib/active_ldap/xml.rb

@@ -68,6 +68,8 @@ module ActiveLdap
           end
         when DN
           targets.concat(normalize_value(value.to_s, options))
+        when nil
+          # ignore
         else
           if /\A#{PRINTABLE_STRING}\z/ !~ value
             value = [value].pack("m").gsub(/\n/u, '')

data/po/active-ldap.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveLdap 1.1.1\n"
-"POT-Creation-Date: 2009-08-04 23:26+0900\n"
-"PO-Revision-Date: 2009-08-04 22:43+0900\n"
+"Project-Id-Version: Ruby/ActiveLdap 1.0.9\n"
+"POT-Creation-Date: 2009-07-09 22:48+0900\n"
+"PO-Revision-Date: 2007-08-12 18:02+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -772,10 +772,6 @@ msgstr ""
 msgid "LDAP|Attribute|olcRootPW"
 msgstr ""
 
-#: -:-
-msgid "LDAP|Attribute|olcSaslAuxprops"
-msgstr ""
-
 #: -:-
 msgid "LDAP|Attribute|olcSaslHost"
 msgstr ""
@@ -892,10 +888,6 @@ msgstr ""
 msgid "LDAP|Attribute|olcUpdateRef"
 msgstr ""
 
-#: -:-
-msgid "LDAP|Attribute|olcWriteTimeout"
-msgstr ""
-
 #: -:-
 msgid "LDAP|Attribute|oncRpcNumber"
 msgstr ""
@@ -3441,17 +3433,17 @@ msgstr ""
 msgid "Can't remove required objectClass: %s"
 msgstr ""
 
-#: lib/active_ldap/adapter/jndi.rb:105 lib/active_ldap/adapter/ldap.rb:203
+#: lib/active_ldap/adapter/jndi.rb:105 lib/active_ldap/adapter/ldap.rb:197
 #: lib/active_ldap/adapter/net_ldap.rb:155
 msgid "%s is not one of the available connect methods: %s"
 msgstr ""
 
-#: lib/active_ldap/adapter/jndi.rb:118 lib/active_ldap/adapter/ldap.rb:216
+#: lib/active_ldap/adapter/jndi.rb:118 lib/active_ldap/adapter/ldap.rb:210
 #: lib/active_ldap/adapter/net_ldap.rb:168
 msgid "%s is not one of the available LDAP scope: %s"
 msgstr ""
 
-#: lib/active_ldap/adapter/jndi.rb:176 lib/active_ldap/adapter/ldap.rb:280
+#: lib/active_ldap/adapter/jndi.rb:176 lib/active_ldap/adapter/ldap.rb:274
 #: lib/active_ldap/adapter/net_ldap.rb:290
 msgid "unknown type: %s"
 msgstr ""
@@ -3460,10 +3452,6 @@ msgstr ""
 msgid "No matches: filter: %s: attributes: %s"
 msgstr ""
 
-#: lib/active_ldap/adapter/ldap.rb:162
-msgid "modify RDN with new superior"
-msgstr ""
-
 #: lib/active_ldap/adapter/net_ldap.rb:211
 msgid "unsupported qops: %s"
 msgstr ""
@@ -3566,17 +3554,13 @@ msgstr ""
 msgid "Couldn't find all %s: DNs (%s)"
 msgstr ""
 
-#: lib/active_ldap/operations.rb:504
-msgid "Failed to delete LDAP entry: <%s>: %s"
-msgstr ""
-
 #: lib/active_ldap/associations.rb:68
 msgid ""
 ":foreign_key belongs_to(:many) option is deprecated since 1.1.0. Use :"
 "primary_key instead."
 msgstr ""
 
-#: lib/active_ldap/associations.rb:136
+#: lib/active_ldap/associations.rb:135
 msgid ""
 ":primary_key and :foreign_key has_many options are inverted their mean since "
 "1.1.0. Please invert them."
@@ -3710,41 +3694,37 @@ msgstr ""
 msgid "%s isn't sub DN of %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:97
+#: lib/active_ldap/validations.rb:85
 msgid "%{fn} is duplicated: %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:108
+#: lib/active_ldap/validations.rb:96
 msgid "%{fn} is invalid: %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:112
+#: lib/active_ldap/validations.rb:100
 msgid "%{fn} isn't set: %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:134
+#: lib/active_ldap/validations.rb:122
 msgid "%{fn} has excluded value: %s"
 msgid_plural "%{fn} has excluded values: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/active_ldap/validations.rb:169
+#: lib/active_ldap/validations.rb:152
 msgid "%{fn} is required attribute by objectClass '%s'"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:171
+#: lib/active_ldap/validations.rb:154
 msgid "%{fn} is required attribute by objectClass '%s': aliases: %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:195
-msgid "<binary-value>"
-msgstr ""
-
-#: lib/active_ldap/validations.rb:203
+#: lib/active_ldap/validations.rb:181
 msgid "%{fn}(%s) has invalid format: %s: required syntax: %s: %s"
 msgstr ""
 
-#: lib/active_ldap/validations.rb:205
+#: lib/active_ldap/validations.rb:183
 msgid "%{fn} has invalid format: %s: required syntax: %s: %s"
 msgstr ""
 
@@ -3798,47 +3778,47 @@ msgstr ""
 msgid "%s is unknown attribute"
 msgstr ""
 
-#: lib/active_ldap/base.rb:266
-msgid "not implemented: %s"
-msgstr ""
-
-#: lib/active_ldap/base.rb:382
+#: lib/active_ldap/base.rb:374
 msgid ""
 "ActiveLdap::Base.establish_connection has been deprecated since 1.1.0. "
 "Please use ActiveLdap::Base.setup_connection instead."
 msgstr ""
 
-#: lib/active_ldap/base.rb:463
+#: lib/active_ldap/base.rb:455
 msgid "scope '%s' must be a Symbol"
 msgstr ""
 
-#: lib/active_ldap/base.rb:514
+#: lib/active_ldap/base.rb:500
 msgid "%s doesn't belong in a hierarchy descending from ActiveLdap"
 msgstr ""
 
-#: lib/active_ldap/base.rb:669
+#: lib/active_ldap/base.rb:655
 msgid ""
 "'%s' must be either nil, DN value as ActiveLdap::DN, String or Array or "
 "attributes as Hash"
 msgstr ""
 
-#: lib/active_ldap/base.rb:799
+#: lib/active_ldap/base.rb:770
+msgid "Failed to delete LDAP entry: %s"
+msgstr ""
+
+#: lib/active_ldap/base.rb:789
 msgid "entry %s can't be saved"
 msgstr ""
 
-#: lib/active_ldap/base.rb:832 lib/active_ldap/base.rb:843
+#: lib/active_ldap/base.rb:808 lib/active_ldap/base.rb:819
 msgid "wrong number of arguments (%d for 1)"
 msgstr ""
 
-#: lib/active_ldap/base.rb:964
+#: lib/active_ldap/base.rb:940
 msgid "Can't find DN '%s' to reload"
 msgstr ""
 
-#: lib/active_ldap/base.rb:1369
+#: lib/active_ldap/base.rb:1337
 msgid "%s's DN attribute (%s) isn't set"
 msgstr ""
 
-#: lib/active_ldap/attributes.rb:80
+#: lib/active_ldap/attributes.rb:76
 msgid "The first argument, name, must not be nil. Please report this as a bug!"
 msgstr ""
 
@@ -3864,7 +3844,7 @@ msgid ""
 "Please use ActiveLdap::Connection.setup_connection instead."
 msgstr ""
 
-#: lib/active_ldap/connection.rb:236
+#: lib/active_ldap/connection.rb:229
 msgid "since 1.1.0. "
 msgstr ""
 
@@ -3958,7 +3938,7 @@ msgstr ""
 msgid "%s has unprintable character: '%s'"
 msgstr ""
 
-#: lib/active_ldap/get_text/parser.rb:96
+#: lib/active_ldap/get_text/parser.rb:94
 msgid "Ignored '%{file}'. Solve dependencies first."
 msgstr ""
 
@@ -3994,37 +3974,37 @@ msgstr ""
 msgid "(default: %s)"
 msgstr ""
 
-#: benchmark/bench-al.rb:186
+#: benchmark/bench-al.rb:219
 msgid "Populating..."
 msgstr ""
 
-#: benchmark/bench-al.rb:243
+#: benchmark/bench-al.rb:276
 msgid "Entries processed by Ruby/ActiveLdap + LDAP: %d"
 msgstr ""
 
-#: benchmark/bench-al.rb:244
+#: benchmark/bench-al.rb:277
 msgid "Entries processed by Ruby/ActiveLdap + Net::LDAP: %d"
 msgstr ""
 
-#: benchmark/bench-al.rb:246
+#: benchmark/bench-al.rb:279
 msgid ""
 "Entries processed by Ruby/ActiveLdap + LDAP: (without object creation): %d"
 msgstr ""
 
-#: benchmark/bench-al.rb:249
+#: benchmark/bench-al.rb:282
 msgid ""
 "Entries processed by Ruby/ActiveLdap + Net::LDAP: (without object creation): "
 "%d"
 msgstr ""
 
-#: benchmark/bench-al.rb:252
+#: benchmark/bench-al.rb:285
 msgid "Entries processed by Ruby/LDAP: %d"
 msgstr ""
 
-#: benchmark/bench-al.rb:253
+#: benchmark/bench-al.rb:286
 msgid "Entries processed by Net::LDAP: %d"
 msgstr ""
 
-#: benchmark/bench-al.rb:257
+#: benchmark/bench-al.rb:290
 msgid "Cleaning..."
 msgstr ""