ruby-activeldap-debug 0.6.0 → 0.7.0

data/lib/activeldap.rb

@@ -469,6 +469,7 @@
 # Most of these are obvious, but I'll step through them for completeness:
 # * :host defines the LDAP server hostname to connect to.
 # * :port defines the LDAP server port to connect to.
+# * :method defines the type of connection - :tls, :ssl, :plain
 # * :base specifies the LDAP search base to use with the prefixes defined in all
 #   subclasses.
 # * :bind_format specifies what your server expects when attempting to bind with
@@ -478,15 +479,17 @@
 # * :user gives the username to substitute into bind_format for binding with
 #   credentials
 # * :password_block, if defined, give the Proc block for acquiring the password
+# * :password, if defined, give the user's password as a String
+# * :store_password indicates whether the password should be stored, or if used
+#   whether the :password_block should be called on each reconnect.
 # * :allow_anonymous determines whether anonymous binding is allowed if other
 #   bind methods fail
+# * :try_sasl, when true, tells ActiveLDAP to attempt a SASL-GSSAPI bind
+# * :sasl_quiet, when true, tells the SASL libraries to not spew messages to STDOUT
 # 
 # Base.connect both connects and binds in one step. It follows roughly the following approach:
 # 
-# * Connect to host:port.
-# * Try TLS.
-# * If that fails try SSL.
-# * If that fails try no encryption.
+# * Connect to host:port using :method
 # 
 # * If user and password_block, attempt to bind with credentials.
 # * If that fails or no password_block and anonymous allowed, attempt to bind
@@ -546,7 +549,7 @@
 # === Others
 # 
 # Other exceptions may be raised by the Ruby/LDAP module, or by other subsystems.
-# If you get one of these exceptions and thing it should be wrapped, write me an
+# If you get one of these exceptions and think it should be wrapped, write me an
 # email and let me know where it is and what you expected. For faster results,
 # email a patch!
 # 
@@ -902,14 +905,15 @@
 # Blanket warning hiding. Remove for debugging
 $VERBOSE, verbose = false, $VERBOSE
 
+require 'activeldap/ldap'
+require 'activeldap/schema2'
 require 'activeldap/base'
 require 'activeldap/associations'
 require 'activeldap/configuration'
-require 'activeldap/schema2'
 
 
 module ActiveLDAP
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end
 
 ActiveLDAP::Base.class_eval do

data/lib/activeldap/base.rb

@@ -50,6 +50,12 @@ module ActiveLDAP
   class AttributeEmpty < RuntimeError
   end
 
+  # ConfigurationError
+  #
+  # An exception raised when there is a problem with Base.connect arguments
+  class ConfigurationError < RuntimeError
+  end
+
   # DeleteError
   #
   # An exception raised when an ActiveLDAP delete action fails
@@ -102,6 +108,7 @@ module ActiveLDAP
     @@config = nil # Container for current connection settings
     @@schema = nil # LDAP server's schema
     @@conn = nil # LDAP connection
+    @@reconnect_attempts = 0 # Number of reconnects attempted
 
     # Driver generator
     #
@@ -110,6 +117,7 @@ module ActiveLDAP
     # is really just a proof of concept and has not truly useful purpose.
     # example: Base.create_object(:class => "user", :dnattr => "uid", :classes => ['top'])
     #
+    # THIS METHOD IS DANGEROUS. INPUT IS NOT SANITIZED.
     def Base.create_object(config={})
       # Just upcase the first letter of the new class name
       str = config[:class]
@@ -160,7 +168,7 @@ module ActiveLDAP
 
       self.class.module_eval <<-"end_eval"
         class ::#{class_name} < ActiveLDAP::Base
-          ldap_mapping :dnattr => "#{attr}, :prefix => "#{prefix}", :classes => "#{classes}"
+          ldap_mapping :dnattr => "#{attr}", :prefix => "#{prefix}", :classes => #{classes}
           #{belongs_to.join("\n")}
           #{has_many.join("\n")}
         end
@@ -177,30 +185,33 @@ module ActiveLDAP
     # :bind_format specifies the string to substitute the username into on bind.  e.g. uid=%s,ou=People,dc=dataspill,dc=org. Overrides @@bind_format.
     # :password_block specifies a Proc object that will yield a String to be used as the password when called.
     # :logger specifies a preconfigured Log4r::Logger to be used for all logging
-    # :host overrides the configuration.rb @@host setting with the LDAP server hostname
-    # :port overrides the configuration.rb @@port setting for the LDAP server port
+    # :host sets the LDAP server hostname
+    # :port sets the LDAP server port
     # :base overwrites Base.base - this affects EVERYTHING
     # :try_sasl indicates that a SASL bind should be attempted when binding to the server (default: false)
     # :allow_anonymous indicates that a true anonymous bind is allowed when trying to bind to the server (default: true)
-    # :retries - indicates the number of attempts to reconnect that will be undertaken when a stale connection occurs.
-    def Base.connect(config={}) # :user, :password_block, :logger
+    # :retries - indicates the number of attempts to reconnect that will be undertaken when a stale connection occurs. -1 means infinite.
+    # :sasl_quiet - if true, sets @sasl_quiet on the Ruby/LDAP connection
+    # :method - whether to use :ssl, :tls, or :plain (unencrypted)
+    # :retry_wait - seconds to wait before retrying a connection
+    # :ldap_scope - dictates how to find objects. ONELEVEL by default to avoid dn_attr collisions across OUs. Think before changing.
+    # See lib/configuration.rb for defaults for each option
+    def Base.connect(config={})
       # Process config
       # Class options
       ## These will be replace by configuration.rb defaults if defined
-      @@config = {}
-      @@config[:host] = config[:host] || @@host
-      @@config[:port] = config[:port] || @@port
-      @@config[:retries] = config[:retries] || 3
-      if config[:base]
-        Base.class_eval <<-"end_eval"
-          def Base.base
-            '#{config[:base]}'
-          end
-        end_eval
+      @@config = DEFAULT_CONFIG.dup
+      config.keys.each do |key|
+        if key == :base
+          # Scrub before inserting
+          base = config[:base].gsub(/['}{#]/, '')
+          Base.class_eval("def Base.base();'#{base}';end")
+        else
+          @@config[key] = config[key]
+        end
       end
-      @@config[:bind_format] = config[:bind_format] || @@bind_format
-
-      @@logger = config[:logger] || nil
+      # Assign a easier name for the logger
+      @@logger = @@config[:logger] || nil
       # Setup default logger to console
       if @@logger.nil?
         @@logger = Log4r::Logger.new('activeldap')
@@ -209,30 +220,13 @@ module ActiveLDAP
         @@logger.add('console')
       end
 
-      # Method options
-      user = nil
-      password_block = nil
-      @@config[:allow_anonymous] = true
-      @@config[:try_sasl] = false
-
-      @@config[:user] = config[:user] || user
-      @@config[:allow_anonymous] = config[:allow_anonymous] if config.has_key? :allow_anonymous
-      @@config[:try_sasl] = config[:try_sasl]
-      @@config[:password_block] = config[:password_block] if config.has_key? :password_block
-
-      # Setup bind credentials
-      @@config[:user] = ENV['USER'] unless @@config[:user]
+      # Reset for the new connection
+      @@reconnect_attempts = 0
 
+      # Make the connection.
       do_connect()
-      
-      # Load Schema (if not straight SSL...)
-      begin
-        @@schema = @@conn.schema() if @@schema.nil?
-      rescue => detail
-        raise ConnectionError, "#{detail.exception} - LDAP connection failure, or server does not support schema queries."
-      end
 
-      # Cleanly return
+      # Make irb users happy with a 'true'
       return true
     end # Base.connect
 
@@ -260,6 +254,56 @@ module ActiveLDAP
       @@conn = conn
     end
 
+    # Attempts to reconnect up to the number of times allowed
+    # If forced, try once then fail with ConnectionError if not connected.
+    def Base.reconnect(force=false)
+      not_connected = true
+      while not_connected
+        # Just to be clean, unbind if possible
+        begin
+          @@conn.unbind() if not @@conn.nil? and @@conn.bound?
+        rescue
+          # Ignore complaints.
+        end
+        @@conn = nil
+
+        if @@config[:retries] == -1 or force == true
+          @@logger.debug('Attempting to reconnect')
+
+          # Reset the attempts if this was forced.
+          @@reconnect_attempts = 0 if @@reconnect_attempts != 0
+          begin
+            do_connect() 
+            not_connected = false
+          rescue => detail
+            @@logger.error("Reconnect to server failed: #{detail.exception}")
+            @@logger.error("Reconnect to server failed backtrace: #{detail.backtrace}")
+            # Do not loop if forced
+            raise ConnectionError, detail.message if force
+          end
+        elsif @@reconnect_attempts < @@config[:retries]
+          @@logger.debug('Attempting to reconnect')
+          @@reconnect_attempts += 1
+          begin
+            do_connect() 
+            not_connected = false
+            # Reset to 0 if a connection was made. 
+            @@reconnect_attempts = 0
+          rescue => detail
+            @@logger.error("Reconnect to server failed: #{detail.exception}")
+            @@logger.error("Reconnect to server failed backtrace: #{detail.backtrace}")
+          end
+        else
+          # Raise a warning
+          raise ConnectionError, 'Giving up trying to reconnect to LDAP server.'
+        end
+
+        # Sleep before looping
+        sleep @@config[:retry_wait]
+      end
+      return true
+    end
+
     # Return the schema object
     def Base.schema
       @@schema
@@ -286,7 +330,6 @@ module ActiveLDAP
       values = []
       config[:attrs] = config[:attrs].to_a # just in case
 
-      tries = 0
       begin
         @@conn.search(config[:base], config[:scope], config[:filter], config[:attrs])  do |m|
           res = {}
@@ -301,14 +344,9 @@ module ActiveLDAP
       rescue RuntimeError => detail
         #TODO# Check for 'No message' when retrying
         # The connection may have gone stale. Let's reconnect and retry. 
-        if tries > @@config[:retries]
-          # Do nothing on failure
-          @@logger.debug "No matches for #{config[:filter]} and attrs #{config[:attrs]}"
-        end
-        tries += 1
-        # Reconnect and rebind.
-        do_connect()
-        retry
+        retry if Base.reconnect()
+        # Do nothing on failure
+        @@logger.debug "No matches for #{config[:filter]} and attrs #{config[:attrs]}"
       end
       return values
     end
@@ -350,10 +388,9 @@ module ActiveLDAP
 
       matches = []
 
-      tries = 0
       begin
         # Get some attributes
-        @@conn.search(base(), LDAP::LDAP_SCOPE_ONELEVEL, "(#{attr}=#{val})")  do |m|
+        @@conn.search(base(), @@config[:ldap_scope], "(#{attr}=#{val})")  do |m|
           # Extract the dnattr value
           dnval = m.dn.split(/,/)[0].split(/=/)[1]
 
@@ -364,22 +401,17 @@ module ActiveLDAP
           end
         end
       rescue RuntimeError => detail
-        #todo# check for 'no message' when retrying
-        # the connection may have gone stale. let's reconnect and retry. 
-        if tries > @@config[:retries]
-          # do nothing on failure
-          @@logger.debug "no matches for #{attr}=#{val}"
-        end
-        tries += 1
-        # reconnect and rebind.
-        do_connect()
-        retry
+        #TODO# Check for 'No message' when retrying
+        # The connection may have gone stale. Let's reconnect and retry. 
+        retry if Base.reconnect()
+
+        # Do nothing on failure
+        @@logger.debug "no matches for #{attr}=#{val}"
       end
       return nil
     end
     private_class_method :find
 
-
     # find_all
     #
     # Finds all matches for value where |value| is the value of some 
@@ -412,10 +444,9 @@ module ActiveLDAP
 
       matches = []
 
-      tries = 0
       begin
         # Get some attributes
-        @@conn.search(base(), LDAP::LDAP_SCOPE_ONELEVEL,
+        @@conn.search(base(), @@config[:ldap_scope],
           "(#{attr}=#{val})")  do |m|
           # Extract the dnattr value
           dnval = m.dn.split(/,/)[0].split(/=/)[1]
@@ -427,19 +458,12 @@ module ActiveLDAP
           end
         end
       rescue RuntimeError => detail
-        #todo# check for 'no message' when retrying
-
-        #TODO# This is broken because search gives bad messages.
+        #TODO# Check for 'No message' when retrying
+        # The connection may have gone stale. Let's reconnect and retry. 
+        retry if Base.reconnect()
 
-        # the connection may have gone stale. let's reconnect and retry. 
-        if tries > @@config[:retries]
-          # do nothing on failure
-          @@logger.debug "no matches for #{attr}=#{val}"
-        end
-        tries += 1
-        # reconnect and rebind.
-        do_connect()
-        retry
+        # Do nothing on failure
+        @@logger.debug "no matches for #{attr}=#{val}"
       end
       return matches
     end
@@ -499,13 +523,16 @@ module ActiveLDAP
     def initialize(val)
       @exists = false
       # Try a default connection if none made explicitly
-      unless Base.connection
+      if Base.connection.nil? and @@reconnect_attempts < @@config[:retries]
         # Use @@config if it has been prepopulated and the conn is down.
         if @@config
-          ActiveLDAP::Base.connect(@@config)
+          ActiveLDAP::Base.reconnect
         else
           ActiveLDAP::Base.connect
         end
+      elsif Base.connection.nil?
+        @@logger.error('Attempted to initialize a new object with no connection')
+        raise ConnectionError, 'Number of reconnect attempts exceeded.'
       end
       if val.class == LDAP::Entry
         # Call import, which is basically initialize
@@ -543,10 +570,9 @@ module ActiveLDAP
         @dn = "#{dnattr()}=#{val},#{base()}"
 
         # Search for the existing entry
-        tries = 0
         begin
           # Get some attributes
-          Base.connection.search(base(), LDAP::LDAP_SCOPE_ONELEVEL, "(#{dnattr()}=#{val})")  do |m|
+          Base.connection.search(base(), @@config[:ldap_scope], "(#{dnattr()}=#{val})")  do |m|
             @exists = true
             # Save DN
             @dn = m.dn
@@ -568,17 +594,13 @@ module ActiveLDAP
             end
           end
         rescue RuntimeError => detail
-          #todo# check for 'no message' when retrying
-          # the connection may have gone stale. let's reconnect and retry. 
-          if tries <= @@config[:retries]
-            tries += 1
-            # reconnect and rebind.
-            do_connect()
-            retry
-          else
-            @@logger.error('new: unable to search for entry')
-            raise detail
-          end
+          #TODO# Check for 'No message' when retrying
+          # The connection may have gone stale. Let's reconnect and retry. 
+          retry if Base.reconnect()
+
+          # Do nothing on failure
+          @@logger.error('new: unable to search for entry')
+          raise detail
         rescue LDAP::ResultError
         end
       end
@@ -678,26 +700,19 @@ module ActiveLDAP
       @@logger.debug("stub: validate finished")
     end
 
-
     # delete
     #
     # Delete this entry from LDAP
     def delete
       @@logger.debug("stub: delete called")
-      tries = 0
       begin
         @@conn.delete(@dn)
         @exists = false
       rescue RuntimeError => detail
         #todo# check for 'no message' when retrying
         # the connection may have gone stale. let's reconnect and retry. 
-        if tries > @@config[:retries]
-          raise DeleteError, "Failed to delete LDAP entry: '#{@dn}'"
-        end
-        tries += 1
-        # reconnect and rebind.
-        do_connect()
-        retry
+        retry if Base.reconnect()
+        raise DeleteError, "Failed to delete LDAP entry: '#{@dn}'"
       rescue LDAP::ResultError => detail
         raise DeleteError, "Failed to delete LDAP entry: '#{@dn}'"
       end
@@ -823,7 +838,6 @@ module ActiveLDAP
           end
         end
         @@logger.debug("#write: traversing data complete")
-        tries = 0
         begin
           @@logger.debug("#write: modifying #{@dn}")
           @@conn.modify(@dn, entry)
@@ -831,13 +845,8 @@ module ActiveLDAP
         rescue RuntimeError => detail
           #todo# check for 'no message' when retrying
           # the connection may have gone stale. let's reconnect and retry. 
-          if tries > @@config[:retries]
-            raise WriteError, "Could not update LDAP entry: #{detail}"
-          end
-          tries += 1
-          # reconnect and rebind.
-          do_connect()
-          retry
+          retry if Base.reconnect()
+          raise WriteError, "Could not update LDAP entry: #{detail}"
         rescue => detail
           raise WriteError, "Could not update LDAP entry: #{detail}"
         end
@@ -861,21 +870,15 @@ module ActiveLDAP
             entry.push(LDAP.mod(LDAP::LDAP_MOD_ADD|binary, pair[0], pair[1]))
           end
         end
-        tries = 0
         begin
           @@logger.debug("#write: adding #{@dn}")
           @@conn.add(@dn, entry)
           @@logger.debug("#write: add successful")
           @exists = true
-        rescue RuntimeError => e
+        rescue RuntimeError => detail
           # The connection may have gone stale. Let's reconnect and retry. 
-          if tries > @@config[:retries]
-            raise WriteError, "Could not add LDAP entry[#{Base.connection.err2string(Base.connection.err)}]: #{detail}"
-          end
-          tries += 1
-          # Reconnect and rebind.
-          do_connect()
-          retry
+          retry if Base.reconnect()
+          raise WriteError, "Could not add LDAP entry[#{Base.connection.err2string(Base.connection.err)}]: #{detail}"
         rescue LDAP::ResultError => detail
           raise WriteError, "Could not add LDAP entry[#{Base.connection.err2string(Base.connection.err)}]: #{detail}"
         end
@@ -1138,66 +1141,65 @@ module ActiveLDAP
     # Performs the actually connection. This separate so that it may
     # be called to refresh stale connections.
     def Base.do_connect()
-        # Wrap the whole thing an try retries times
-        tries = 0
-        begin
-          # Connect to LDAP
-          begin
-            # SSL using START_TLS
+      begin
+        case @@config[:method]
+          when :ssl
+            @@conn = LDAP::SSLConn.new(@@config[:host], @@config[:port], false)
+          when :tls
             @@conn = LDAP::SSLConn.new(@@config[:host], @@config[:port], true)
-          rescue
-            @@logger.warn "Warning: Failed to connect using TLS!"
-            begin
-              @@logger.warn "Warning: Attempting SSL connection . . ."
-              @@conn = LDAP::SSLConn.new(@@config[:host], @@config[:port], false)
-              # HACK: Load the schema here because otherwise you can't tell if the
-              # HACK: SSLConn is a real SSL connection.
-              @@schema = @@conn.schema() if @@schema.nil?
-            rescue
-              @@logger.warn "Warning: Attempting unencrypted connection . . ."
-              @@conn = LDAP::Conn.new(@@config[:host], @@config[:port])
-            end
-          end
-          @@logger.debug "Connected to #{@@config[:host]}:#{@@config[:port]}."
-
-          # Enforce LDAPv3
-          @@conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
-
-          # Authenticate
-          do_bind
-        rescue => e
-          # Retry
-          tries += 1
-          raise e if tries > @@config[:retries]
-          retry
+          when :plain
+            @@conn = LDAP::Conn.new(@@config[:host], @@config[:port])
+          else
+            raise ConfigurationError,"#{@@config[:method]} is not one of the available connect methods :ssl, :tls, or :plain"
         end
-    end
+      rescue ConfigurationError => e
+        # Pass through
+        raise e
+      rescue => e
+        @@logger.error("Failed to connect using #{@@config[:method]}")
+        raise e
+      end
 
+      # Enforce LDAPv3
+      @@conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
+
+      # Authenticate
+      do_bind
+
+      # Retrieve the schema. We need this to automagically determine attributes
+      begin
+        @@schema = @@conn.schema() if @@schema.nil?
+      rescue => e
+        @@logger.error("Failed to retrieve the schema (#{@@config[:method]})")
+        @@logger.error("Schema failure exception: #{e.exception}")
+        @@logger.error("Schema failure backtrace: #{e.backtrace}")
+        raise ConnectionError, "#{e.exception} - LDAP connection failure, or server does not support schema queries."
+      end
+
+      @@logger.debug "Connected to #{@@config[:host]}:#{@@config[:port]} using #{@@config[:method]}"
+    end
 
      # Wrapper all bind activity
      def Base.do_bind()
        bind_dn = @@config[:bind_format] % [@@config[:user]]
-       if @@config[:password_block]
-         password = @@config[:password_block].call
-         @@config[:password_block] = Proc.new { password }
-       end
-
        # Rough bind loop:
        # Attempt 1: SASL if available
        # Attempt 2: SIMPLE with credentials if password block
        # Attempt 3: SIMPLE ANONYMOUS if 1 and 2 fail (or pwblock returns '')
-       auth = false
-       auth = do_sasl_bind(bind_dn) if @@config[:try_sasl]
-       auth = do_simple_bind(bind_dn) unless auth
-       auth = do_anonymous_bind(bind_dn) if not auth and @@config[:allow_anonymous]
-
-       unless auth
-         raise AuthenticationError, "All authentication mechanisms failed"
+       if @@config[:try_sasl] and do_sasl_bind(bind_dn)
+         @@logger.info('Bound SASL')
+       elsif do_simple_bind(bind_dn)
+         @@logger.info('Bound simple')
+       elsif @@config[:allow_anonymous] and do_anonymous_bind(bind_dn)
+         @@logger.info('Bound simple')
+       else
+         @@logger.error('Failed to bind using any available method')
+         raise *LDAP::err2exception(@@conn.err) if @@conn.err != 0
        end
-       return auth
+
+       return @@conn.bound?
      end
 
- 
      # Base.do_anonymous_bind
      #
      # Bind to LDAP with the given DN, but with no password. (anonymous!)
@@ -1206,26 +1208,62 @@ module ActiveLDAP
        begin
          @@conn.bind()
          return true
-       rescue
+       rescue => e
          @@logger.debug "LDAP Error: #{@@conn.err2string(@@conn.err)}"
+         @@logger.debug "Exception: #{e.exception}"
+         @@logger.debug "Backtrace: #{e.backtrace}"
          @@logger.warn "Warning: Anonymous authentication failed."
+         @@logger.warn "message: #{e.message}"
          return false
        end
      end
 
      # Base.do_simple_bind
      #
-     # Bind to LDAP with the given DN and password_block.call()
+     # Bind to LDAP with the given DN and password
      def Base.do_simple_bind(bind_dn)
-       return false unless @@config[:password_block].respond_to? :call
+       # Bail if we have no password or password block
+       if not @@config[:password_block].nil? and not @@config[:password].nil?
+         return false
+       end
+
+       # TODO: Give a warning to reconnect users with password clearing
+       # Get the passphrase for the first time, or anew if we aren't storing
+       password = ''
+       if not @@config[:password].nil?
+         password = @@config[:password]
+       elsif not @@config[:password_block].nil?
+         unless @@config[:password_block].respond_to?(:call)
+           @@logger.error('Skipping simple bind: ' +
+                          ':password_block not nil or Proc object. Ignoring.')
+           return false 
+         end
+         password = @@config[:password_block].call
+       else
+         @@logger.error('Skipping simple bind: ' +
+                        ':password_block and :password options are empty.')
+         return false 
+       end
+
        begin
-         @@conn.bind(bind_dn, @@config[:password_block].call())
-         return true
-       rescue
+         @@conn.bind(bind_dn, password)
+       rescue => e
          @@logger.debug "LDAP Error: #{@@conn.err2string(@@conn.err)}"
-         @@logger.warn "Warning: SIMPLE authentication failed."
+         # TODO: replace this with LDAP::err2exception()
+         if @@conn.err == LDAP::LDAP_SERVER_DOWN
+           @@logger.error "Warning: " + e.message
+         else
+           @@logger.warn "Warning: SIMPLE authentication failed."
+         end
          return false
        end
+       # Store the password for quick reference later
+       if @@config[:store_password]
+         @@config[:password] = password
+       elsif @@config[:store_password] == false
+         @@config[:password] = nil
+       end
+       return true
      end
 
      # Base.do_sasl_bind
@@ -1240,6 +1278,7 @@ module ActiveLDAP
        # TODO: Investigate further SASL support
        if mechanisms.respond_to? :member? and mechanisms.member? 'GSSAPI'
          begin
+           @@conn.sasl_quiet = @@config[:sasl_quiet] if @@config.has_key?(:sasl_quiet)
            @@conn.sasl_bind(bind_dn, 'GSSAPI')
            return true
          rescue

data/lib/activeldap/configuration.rb

@@ -6,9 +6,25 @@ module ActiveLDAP
  # ActiveLDAP to work with your LDAP server. All of these
  # settings can be passed in at initialization time.
  module Configuration
-    @@host = "127.0.0.1"
-    @@port = 389
-    @@bind_format = "cn=%s,dc=localdomain"
+    DEFAULT_CONFIG = {}
+    DEFAULT_CONFIG[:host] = '127.0.0.1'
+    DEFAULT_CONFIG[:port] = 389
+    DEFAULT_CONFIG[:method] = :plain  # :ssl, :tls, :plain allowed
+
+    DEFAULT_CONFIG[:bind_format] = "cn=%s,dc=localdomain"
+    DEFAULT_CONFIG[:user] = ENV['USER']
+    DEFAULT_CONFIG[:password_block] = nil
+    DEFAULT_CONFIG[:password] = nil
+    DEFAULT_CONFIG[:store_password] = true
+    DEFAULT_CONFIG[:allow_anonymous] = true
+    DEFAULT_CONFIG[:sasl_quiet] = false
+    DEFAULT_CONFIG[:try_sasl] = false
+
+    DEFAULT_CONFIG[:retries] = 3
+    DEFAULT_CONFIG[:retry_wait] = 3
+
+    DEFAULT_CONFIG[:logger] = nil
+    DEFAULT_CONFIG[:ldap_scope] = LDAP::LDAP_SCOPE_ONELEVEL
 
     # Make the return value the string that is your LDAP base
     def Base.base

data/lib/activeldap/ldap.rb

@@ -0,0 +1,26 @@
+# Extensions to Rubu/LDAP to make ActiveLDAP behave better
+#
+
+
+
+module LDAP
+  # Creates useful exceptions from err2string 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!
+    begin
+     exc = LDAP.const_get(err)
+    rescue NameError
+     # Doesn't exist :-)
+     LDAP.module_eval(<<-end_module_eval)
+       class #{err} < LDAP::ResultError
+       end
+     end_module_eval
+     exc = LDAP.const_get(err)
+    end
+    return [exc, err2string(errno)]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-activeldap-debug
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2006-01-09
+  version: 0.7.0
+date: 2006-05-03 00:00:00 +01:00
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
-  - lib
+- lib
 email: will@alum.bu.edu
 homepage: http://projects.dataspill.org/libraries/ruby/activeldap/index.html
 rubyforge_project: ruby-activeldap
@@ -18,37 +18,43 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Will Drewry
+- Will Drewry
 files: 
-  - lib/activeldap
-  - lib/activeldap.rb
-  - lib/activeldap/associations.rb
-  - lib/activeldap/base.rb
-  - lib/activeldap/configuration.rb
-  - lib/activeldap/schema2.rb
+- lib/activeldap
+- lib/activeldap.rb
+- lib/activeldap/associations.rb
+- lib/activeldap/base.rb
+- lib/activeldap/configuration.rb
+- lib/activeldap/ldap.rb
+- lib/activeldap/schema2.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - "(Open)LDAP server"
-  - ruby-ldap = 0.8.2
+- (Open)LDAP server
+- ruby-ldap = 0.8.2
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: log4r
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.4
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.4
+    version: