ruby-activeldap-debug 0.7.0 → 0.7.1

data/lib/activeldap/base.rb

@@ -1,7 +1,8 @@
 # === ActiveLDAP - an OO-interface to LDAP objects inspired by ActiveRecord
 # Author: Will Drewry <will@alum.bu.edu>
 # License: See LICENSE and COPYING.txt
-# Copyright 2004 Will Drewry <will@alum.bu.edu>
+# Copyright 2004-2006 Will Drewry <will@alum.bu.edu>
+# Some portions Copyright 2006 Google Inc
 #
 # == Summary
 # ActiveLDAP lets you read and update LDAP entries in a completely object
@@ -347,6 +348,12 @@ module ActiveLDAP
         retry if Base.reconnect()
         # Do nothing on failure
         @@logger.debug "No matches for #{config[:filter]} and attrs #{config[:attrs]}"
+      rescue => detail
+        if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+          @@logger.debug("Failed to write: #{entry}")
+          retry if Base.reconnect()
+        end
+        raise detail
       end
       return values
     end
@@ -407,6 +414,12 @@ module ActiveLDAP
 
         # Do nothing on failure
         @@logger.debug "no matches for #{attr}=#{val}"
+      rescue => detail
+        if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+          @@logger.debug("Failed to write: #{entry}")
+          retry if Base.reconnect()
+        end
+        raise detail
       end
       return nil
     end
@@ -464,6 +477,12 @@ module ActiveLDAP
 
         # Do nothing on failure
         @@logger.debug "no matches for #{attr}=#{val}"
+      rescue => detail
+        if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+          @@logger.debug("Failed to write: #{entry}")
+          retry if Base.reconnect()
+        end
+        raise detail
       end
       return matches
     end
@@ -714,6 +733,10 @@ module ActiveLDAP
         retry if Base.reconnect()
         raise DeleteError, "Failed to delete LDAP entry: '#{@dn}'"
       rescue LDAP::ResultError => detail
+        if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+          @@logger.debug("Failed to write: #{entry}")
+          retry if Base.reconnect()
+        end
         raise DeleteError, "Failed to delete LDAP entry: '#{@dn}'"
       end
     end
@@ -796,6 +819,8 @@ module ActiveLDAP
           name = @attr_methods[name]
           name = pair[0].split(/;/)[0] if name.nil? # for objectClass, or removed vals
           value = data[name+suffix]
+          # If it doesn't exist, don't freak out.
+          value = [] if value.nil?
 
           # Detect subtypes and account for them
           binary = LDAP::LDAP_MOD_BVALUES if Base.schema.binary? name
@@ -827,6 +852,8 @@ module ActiveLDAP
           name = @attr_methods[name]
           name = pair[0].split(/;/)[0] if name.nil? # for obj class or removed vals
           value = pair[1]
+          # Make sure to change this to an Array if there was mistake earlier.
+          value = [] if value.nil?
 
           if not replaceable.member? name+suffix
             # Detect subtypes and account for them
@@ -843,11 +870,17 @@ module ActiveLDAP
           @@conn.modify(@dn, entry)
           @@logger.debug("#write: modify successful")
         rescue RuntimeError => detail
-          #todo# check for 'no message' when retrying
+          #todo# check for SERVER_DOWN
           # the connection may have gone stale. let's reconnect and retry. 
           retry if Base.reconnect()
           raise WriteError, "Could not update LDAP entry: #{detail}"
         rescue => detail
+          @@logger.debug(LDAP::err2exception(@@conn.err).inspect)
+          if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+            @@logger.debug("Failed to write: #{entry}")
+            retry if Base.reconnect()
+          end
+          @@logger.debug("Failed to write: #{entry}")
           raise WriteError, "Could not update LDAP entry: #{detail}"
         end
       else # add everything!
@@ -880,6 +913,10 @@ module ActiveLDAP
           retry if Base.reconnect()
           raise WriteError, "Could not add LDAP entry[#{Base.connection.err2string(Base.connection.err)}]: #{detail}"
         rescue LDAP::ResultError => detail
+          if LDAP::err2exception(@@conn.err)[0] == LDAP::ServerDown
+            @@logger.debug("Failed to write: #{entry}")
+            retry if Base.reconnect()
+          end
           raise WriteError, "Could not add LDAP entry[#{Base.connection.err2string(Base.connection.err)}]: #{detail}"
         end
       end
@@ -1347,8 +1384,21 @@ module ActiveLDAP
          raise AttributeAssignmentError, 'cannot modify the DN attribute value'
        end
 
+       # Enforce LDAP-pleasing values
+       @@logger.debug("value = #{value.inspect}, value.class = #{value.class}")
+       real_value = value
+       # Squash empty values
+       if value.class == Array
+         real_value = value.collect {|c| if c == ''; []; else c; end }.flatten
+       end
+       real_value = [] if real_value.nil?
+       real_value = [] if real_value == ''
+       real_value = [real_value] if real_value.class == String
+       real_value = [real_value.to_s] if real_value.class == Fixnum
+       # NOTE: Hashes are allowed for subtyping.
+
        # Assign the value 
-       @data[attr] = value
+       @data[attr] = real_value
 
        # Return the passed in value
        @@logger.debug("stub: exitting attribute_method=")

data/lib/activeldap/ldap.rb

@@ -1,25 +1,104 @@
 # Extensions to Rubu/LDAP to make ActiveLDAP behave better
 #
+# Copyright 2006 Will Drewry <will@alum.bu.edu>
+# Some portions Copyright 2006 Google Inc
 
 
 
 module LDAP
-  # Creates useful exceptions from err2string output
+  ERRORS = [
+    "LDAP_SUCCESS",
+    "LDAP_OPERATIONS_ERROR",
+    "LDAP_PROTOCOL_ERROR",
+    "LDAP_TIMELIMIT_EXCEEDED",
+    "LDAP_SIZELIMIT_EXCEEDED",
+    "LDAP_COMPARE_FALSE",
+    "LDAP_COMPARE_TRUE",
+    "LDAP_STRONG_AUTH_NOT_SUPPORTED",
+    "LDAP_AUTH_METHOD_NOT_SUPPORTED",
+    "LDAP_STRONG_AUTH_REQUIRED",
+    "LDAP_REFERRAL",
+    "LDAP_ADMINLIMIT_EXCEEDED",
+    "LDAP_UNAVAILABLE_CRITICAL_EXTENSION",
+    "LDAP_CONFIDENTIALITY_REQUIRED",
+    "LDAP_SASL_BIND_IN_PROGRESS",
+    "LDAP_PARTIAL_RESULTS",
+    "LDAP_NO_SUCH_ATTRIBUTE",
+    "LDAP_UNDEFINED_TYPE",
+    "LDAP_INAPPROPRIATE_MATCHING",
+    "LDAP_CONSTRAINT_VIOLATION",
+    "LDAP_TYPE_OR_VALUE_EXISTS",
+    "LDAP_INVALID_SYNTAX",
+    "LDAP_NO_SUCH_OBJECT",
+    "LDAP_ALIAS_PROBLEM",
+    "LDAP_INVALID_DN_SYNTAX",
+    "LDAP_IS_LEAF",
+    "LDAP_ALIAS_DEREF_PROBLEM",
+    "LDAP_INAPPROPRIATE_AUTH",
+    "LDAP_INVALID_CREDENTIALS",
+    "LDAP_INSUFFICIENT_ACCESS",
+    "LDAP_BUSY",
+    "LDAP_UNAVAILABLE",
+    "LDAP_UNWILLING_TO_PERFORM",
+    "LDAP_LOOP_DETECT",
+    "LDAP_NAMING_VIOLATION",
+    "LDAP_OBJECT_CLASS_VIOLATION",
+    "LDAP_NOT_ALLOWED_ON_NONLEAF",
+    "LDAP_NOT_ALLOWED_ON_RDN",
+    "LDAP_ALREADY_EXISTS",
+    "LDAP_NO_OBJECT_CLASS_MODS",
+    "LDAP_RESULTS_TOO_LARGE",
+    "LDAP_OTHER",
+    "LDAP_SERVER_DOWN",
+    "LDAP_LOCAL_ERROR",
+    "LDAP_ENCODING_ERROR",
+    "LDAP_DECODING_ERROR",
+    "LDAP_TIMEOUT",
+    "LDAP_AUTH_UNKNOWN",
+    "LDAP_FILTER_ERROR",
+    "LDAP_USER_CANCELLED",
+    "LDAP_PARAM_ERROR",
+    "LDAP_NO_MEMORY",
+    "LDAP_CONNECT_ERROR"
+  ]
+  attr_reader :error_map
+  # Calls err2exception() with 1...100 to
+  # pregenerate all the constants for errors.
+  # TODO: look at other support LDAP SDKs for weirdness
+  def LDAP::generate_err2exceptions()
+    hash = {}
+    ERRORS.each do |err|
+      begin
+        val = LDAP.const_get(err)
+        # Make name into a exception
+        exc = err.gsub(/^LDAP_/, '') 
+        exc = exc.split('_').collect {|w| w.capitalize }.join('')
+        # Doesn't exist :-)
+        LDAP.module_eval(<<-end_module_eval)
+          class #{exc} < LDAP::ResultError
+          end
+        end_module_eval
+        hash[val] = exc
+      rescue NameError
+        # next!
+      end
+    end
+    @@error_map = hash
+  end
+
+  # Creates useful exceptions from @@conn.err output
   # Returns [exception, message] based on err2string
   def LDAP.err2exception(errno=0)
-    err = LDAP::err2string(errno)
-    err = err.split(' ').collect {|w| w.capitalize }.join('')
-    err.gsub!(/[^A-Za-z]/, '')
-    # If the exception exists - raise it!
+    need_to_rebuild = true
     begin
-     exc = LDAP.const_get(err)
+     exc = LDAP.const_get(@@error_map[errno])
     rescue NameError
-     # Doesn't exist :-)
-     LDAP.module_eval(<<-end_module_eval)
-       class #{err} < LDAP::ResultError
-       end
-     end_module_eval
-     exc = LDAP.const_get(err)
+     if need_to_rebuild
+       generate_err2exceptions()
+       need_to_rebuild = false
+       retry
+     end
+     exc = RuntimeError
     end
     return [exc, err2string(errno)]
   end

data/lib/activeldap.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 # = Ruby/ActiveLDAP 
 #
 # "Ruby/ActiveLDAP" Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
@@ -913,7 +913,7 @@ require 'activeldap/configuration'
 
 
 module ActiveLDAP
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end
 
 ActiveLDAP::Base.class_eval do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-activeldap-debug
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2006-05-03 00:00:00 +01:00
+  version: 0.7.1
+date: 2006-05-04 00:00:00 +01:00
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
 - lib