devise_ldap_authenticatable 0.5.0 → 0.5.1

data/lib/devise_ldap_authenticatable/ldap_adapter.rb

@@ -13,14 +13,6 @@ module Devise
       resource = LdapConnect.new(options)
       resource.authorized?
     end
-
-    def self.valid_login?(login)
-      options = {:login => login, 
-                 :ldap_auth_username_builder => ::Devise.ldap_auth_username_builder,
-                 :admin => ::Devise.ldap_use_admin_to_bind}
-      resource = LdapConnect.new(options)
-      resource.valid_login?
-    end
     
     def self.update_password(login, new_password)
       options = {:login => login,
@@ -31,32 +23,36 @@ module Devise
       resource = LdapConnect.new(options)
       resource.change_password! if new_password.present? 
     end
-    
-    def self.get_groups(login)
+
+    def self.ldap_connect(login)
       options = {:login => login, 
                  :ldap_auth_username_builder => ::Devise.ldap_auth_username_builder,
                  :admin => ::Devise.ldap_use_admin_to_bind}
 
-      ldap = LdapConnect.new(options)
-      ldap.user_groups
+      resource = LdapConnect.new(options)
+    end
+
+    def self.valid_login?(login)
+      self.ldap_connect(login).valid_login?
+    end
+
+    def self.get_groups(login)
+      self.ldap_connect(login).user_groups
     end
     
     def self.get_dn(login)
-      options = {:login => login, 
-                 :ldap_auth_username_builder => ::Devise.ldap_auth_username_builder,
-                 :admin => ::Devise.ldap_use_admin_to_bind}
-      resource = LdapConnect.new(options)
-      resource.dn
+      self.ldap_connect(login).dn
     end
 
     def self.get_ldap_param(login,param)
-      options = {:login => login, 
-                 :ldap_auth_username_builder => ::Devise.ldap_auth_username_builder,
-                 :admin => ::Devise.ldap_use_admin_to_bind}
-      resource = LdapConnect.new(options)
+      resource = self.ldap_connect(login)
       resource.ldap_param_value(param)
     end
 
+    def self.get_ldap_entry(login)
+      self.ldap_connect(login).search_for_login
+    end
+
     class LdapConnect
 
       attr_reader :ldap, :login
@@ -100,8 +96,19 @@ module Devise
         ldap_entry = nil
         @ldap.search(:filter => filter) {|entry| ldap_entry = entry}
 
-				DeviseLdapAuthenticatable::Logger.send("Requested param #{param} has value #{ldap_entry.send(param)}")
-				ldap_entry.send(param)
+        if ldap_entry 
+          if ldap_entry[param]
+            DeviseLdapAuthenticatable::Logger.send("Requested param #{param} has value #{ldap_entry.send(param)}")
+            value = ldap_entry.send(param)
+            value = value.first if value.is_a?(Array) and value.count == 1
+          else
+            DeviseLdapAuthenticatable::Logger.send("Requested param #{param} does not exist")
+            value = nil
+          end
+        else
+          DeviseLdapAuthenticatable::Logger.send("Requested ldap entry does not exist")
+          value = nil
+        end
 			end
 			
       def authenticate!
@@ -189,6 +196,17 @@ module Devise
       def valid_login?
         !search_for_login.nil?
       end
+
+      # Searches the LDAP for the login
+      #
+      # @return [Object] the LDAP entry found; nil if not found
+      def search_for_login
+        DeviseLdapAuthenticatable::Logger.send("LDAP search for login: #{@attribute}=#{@login}")
+        filter = Net::LDAP::Filter.eq(@attribute.to_s, @login.to_s)
+        ldap_entry = nil
+        @ldap.search(:filter => filter) {|entry| ldap_entry = entry}
+        ldap_entry
+      end
       
       private
       
@@ -207,17 +225,6 @@ module Devise
         DeviseLdapAuthenticatable::Logger.send("Finding user: #{dn}")
         ldap.search(:base => dn, :scope => Net::LDAP::SearchScope_BaseObject).try(:first)
       end
-
-      # Searches the LDAP for the login
-      #
-      # @return [Object] the LDAP entry found; nil if not found
-      def search_for_login
-        DeviseLdapAuthenticatable::Logger.send("LDAP search for login: #{@attribute}=#{@login}")
-        filter = Net::LDAP::Filter.eq(@attribute.to_s, @login.to_s)
-        ldap_entry = nil
-        @ldap.search(:filter => filter) {|entry| ldap_entry = entry}
-        ldap_entry
-      end
       
       def update_ldap(ops)
         operations = []

data/lib/devise_ldap_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseLdapAuthenticatable
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_ldap_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13886720 !ruby/object:Gem::Requirement
+  requirement: &70110522209540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *13886720
+  version_requirements: *70110522209540
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &13884260 !ruby/object:Gem::Requirement
+  requirement: &70110522208060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,7 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *13884260
+  version_requirements: *70110522208060
 description: Devise extension to allow authentication via LDAP
 email: curtis.schiewek@gmail.com
 executables: []
@@ -156,8 +156,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Devise extension to allow authentication via LDAP
-test_files: []
+test_files:
+- test/devise_ldap_authenticatable_test.rb
+- test/ldap/base.ldif
+- test/ldap/clear.ldif
+- test/ldap/local.schema
+- test/ldap/openldap-data/run/.gitkeep
+- test/ldap/run-server.sh
+- test/ldap/server.pem
+- test/ldap/slapd-ssl-test.conf
+- test/ldap/slapd-test.conf
+- test/rails_app/Gemfile
+- test/rails_app/Gemfile.lock
+- test/rails_app/Rakefile
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/posts_controller.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/helpers/posts_helper.rb
+- test/rails_app/app/models/post.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/posts/index.html.erb
+- test/rails_app/config.ru
+- test/rails_app/config/application.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/cucumber.yml
+- test/rails_app/config/database.yml
+- test/rails_app/config/environment.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/devise.rb
+- test/rails_app/config/initializers/inflections.rb
+- test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/secret_token.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/ldap.yml
+- test/rails_app/config/ldap_with_boolean_ssl.yml
+- test/rails_app/config/ldap_with_erb.yml
+- test/rails_app/config/ldap_with_uid.yml
+- test/rails_app/config/locales/devise.en.yml
+- test/rails_app/config/locales/en.yml
+- test/rails_app/config/routes.rb
+- test/rails_app/config/ssl_ldap.yml
+- test/rails_app/config/ssl_ldap_with_erb.yml
+- test/rails_app/config/ssl_ldap_with_uid.yml
+- test/rails_app/db/migrate/20100708120302_create_posts.rb
+- test/rails_app/db/migrate/20100708120448_devise_create_users.rb
+- test/rails_app/db/schema.rb
+- test/rails_app/db/seeds.rb
+- test/rails_app/features/manage_logins.feature
+- test/rails_app/features/step_definitions/login_steps.rb
+- test/rails_app/features/step_definitions/web_steps.rb
+- test/rails_app/features/support/env.rb
+- test/rails_app/features/support/paths.rb
+- test/rails_app/lib/tasks/.gitkeep
+- test/rails_app/lib/tasks/cucumber.rake
+- test/rails_app/public/404.html
+- test/rails_app/public/422.html
+- test/rails_app/public/500.html
+- test/rails_app/public/images/rails.png
+- test/rails_app/public/javascripts/application.js
+- test/rails_app/public/javascripts/controls.js
+- test/rails_app/public/javascripts/dragdrop.js
+- test/rails_app/public/javascripts/effects.js
+- test/rails_app/public/javascripts/prototype.js
+- test/rails_app/public/javascripts/rails.js
+- test/rails_app/public/stylesheets/.gitkeep
+- test/rails_app/script/cucumber
+- test/rails_app/script/rails
+- test/rails_app/test/factories/users.rb
+- test/rails_app/test/functional/posts_controller_test.rb
+- test/rails_app/test/performance/browsing_test.rb
+- test/rails_app/test/test_helper.rb
+- test/rails_app/test/unit/helpers/posts_helper_test.rb
+- test/rails_app/test/unit/post_test.rb
+- test/rails_app/test/unit/user_test.rb
+- test/test_helper.rb