socialcast_ldap_integration 1.1.14 → 1.1.15

data/lib/socialcast/ldap_integration.rb

@@ -187,8 +187,10 @@ module Socialcast
       matched_account = nil
     
       self.connect do |ldap, connection|
-        map = connection['map']
-        ldap.search(self.construct_filter_for_search(connection, nil, "#{map[identifying_field]}=#{identifier}")) do |entry, connection|
+        map = connection["map"]
+        base = discover_base_dn(map[identifying_field], identifier)
+        filter = self.construct_filter_for_search(connection, nil, "#{map[identifying_field]}=#{identifier}")
+        ldap.search(:base => base, :filter => filter[:filter]) do |entry, connection|
           matched_account = entry
         end
         if matched_account
@@ -202,10 +204,12 @@ module Socialcast
 
       nil
     end
-    
 
     protected
 
+    # TODO: this method currently returns a hash, but the Net::LDAP
+    # search method expects :filter to be a Net::LDAP::Filter object.
+    # Should we change the method to match this expectation?
     def self.construct_filter_for_search(connection, filter_options=nil, auxiliary_filter=nil)
       unless filter_options
         search_filter = connection['filter_string'].blank? ? NULL_FILTER : Net::LDAP::Filter.construct(connection['filter_string'])

data/lib/socialcast/ldap_integration/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module LdapIntegration
-    VERSION = "1.1.14"
+    VERSION = "1.1.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast_ldap_integration
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast_ldap_integration
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Provides support for connecting to and traversing LDAP trees.