devise_ldap_authenticatable 0.5.1 → 0.6.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'devise', '~> 1.5.0'
+gem 'devise', '~> 2.0.0'
 gem 'net-ldap', '~> 0.2.2'
 
 platforms :mri_18 do

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    devise_ldap_authenticatable (0.5.1)
+      devise (~> 1.5.0)
+      net-ldap (~> 0.2.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bcrypt-ruby (3.0.1)
+    columnize (0.3.6)
+    devise (1.5.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    net-ldap (0.2.2)
+    orm_adapter (0.0.6)
+    rack (1.4.0)
+    rbx-require-relative (0.0.5)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    warden (1.1.0)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  devise (~> 1.5.0)
+  devise_ldap_authenticatable!
+  net-ldap (~> 0.2.2)
+  ruby-debug (>= 0.10.3)

data/devise_ldap_authenticatable.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('devise', '~> 1.5.0')
+  s.add_dependency('devise', '>= 2.0.0')
   s.add_dependency('net-ldap', '~> 0.2.2')
 end

data/lib/devise_ldap_authenticatable/model.rb

@@ -21,7 +21,7 @@ module Devise
         @login_with ||= Devise.mappings[self.class.to_s.underscore.to_sym].to.authentication_keys.first
         self[@login_with]
       end
-      
+
       def reset_password!(new_password, new_password_confirmation)
         if new_password == new_password_confirmation && ::Devise.ldap_update_password
           Devise::LdapAdapter.update_password(login_with, new_password)
@@ -42,11 +42,11 @@ module Devise
           return false
         end
       end
-      
+
       def ldap_groups
         Devise::LdapAdapter.get_groups(login_with)
       end
-      
+
       def ldap_dn
         Devise::LdapAdapter.get_dn(login_with)
       end
@@ -67,34 +67,36 @@ module Devise
       module ClassMethods
         # Authenticate a user based on configured attribute keys. Returns the
         # authenticated user if it's valid or nil.
-        def authenticate_with_ldap(attributes={}) 
+        def authenticate_with_ldap(attributes={})
           auth_key = self.authentication_keys.first
-          return nil unless attributes[auth_key].present? 
+          return nil unless attributes[auth_key].present?
+
+          auth_key_value = (self.case_insensitive_keys || []).include?(auth_key) ? attributes[auth_key].downcase : attributes[auth_key]
 
           # resource = find_for_ldap_authentication(conditions)
-          resource = where(auth_key => attributes[auth_key]).first
-                    
+          resource = where(auth_key => auth_key_value).first
+
           if (resource.blank? and ::Devise.ldap_create_user)
             resource = new
-            resource[auth_key] = attributes[auth_key]
+            resource[auth_key] = auth_key_value
             resource.password = attributes[:password]
           end
-                    
+
           if resource.try(:valid_ldap_authentication?, attributes[:password])
             if resource.new_record?
               resource.ldap_before_save if resource.respond_to?(:ldap_before_save)
-              resource.save 
+              resource.save
             end
             return resource
           else
             return nil
           end
         end
-        
+
         def update_with_password(resource)
           puts "UPDATE_WITH_PASSWORD: #{resource.inspect}"
         end
-        
+
       end
     end
   end

data/lib/devise_ldap_authenticatable/version.rb

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

data/test/rails_app/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
-gem "devise", "~> 1.4.0"
+gem "devise", "~> 1.5.0"
 gem "devise_ldap_authenticatable", :path => "../../"
 
 group :test do

data/test/rails_app/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../../
   specs:
-    devise_ldap_authenticatable (0.4.9)
-      devise (~> 1.4.0)
+    devise_ldap_authenticatable (0.5.1)
+      devise (~> 1.5.0)
       net-ldap (~> 0.2.2)
 
 GEM
@@ -64,10 +64,10 @@ GEM
       cucumber (>= 0.8.0)
     culerity (0.2.12)
     database_cleaner (0.5.2)
-    devise (1.4.7)
+    devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
+      warden (~> 1.1)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -94,7 +94,7 @@ GEM
       rake
     net-ldap (0.2.2)
     nokogiri (1.4.3.1)
-    orm_adapter (0.0.5)
+    orm_adapter (0.0.6)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.12)
@@ -134,7 +134,7 @@ GEM
       polyglot (>= 0.3.1)
     trollop (1.16.2)
     tzinfo (0.3.23)
-    warden (1.0.5)
+    warden (1.1.0)
       rack (>= 1.0)
 
 PLATFORMS
@@ -147,7 +147,7 @@ DEPENDENCIES
   capybara
   cucumber-rails
   database_cleaner
-  devise (~> 1.4.0)
+  devise (~> 1.5.0)
   devise_ldap_authenticatable!
   factory_girl_rails
   launchy

data/test/rails_app/test/unit/user_test.rb

@@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase
   def should_be_validated(user, password, message = "Password is invalid")
     assert(user.valid_ldap_authentication?(password), message)
   end
-  
+
   def should_not_be_validated(user, password, message = "Password is not properly set")
      assert(!user.valid_ldap_authentication?(password), message)
   end
@@ -25,12 +25,12 @@ class UserTest < ActiveSupport::TestCase
         assert_equal false, ::Devise::LdapAdapter.valid_login?('barneystinson')
       end
     end
-  
+
     context "create a basic user" do
       setup do
         @user = Factory(:user)
       end
-  
+
       should "check for password validation" do
         assert_equal(@user.email, "example.user@test.com")
         should_be_validated @user, "secret"
@@ -38,18 +38,18 @@ class UserTest < ActiveSupport::TestCase
         should_not_be_validated @user, "Secret"
       end
     end
-  
+
     context "change a LDAP password" do
       setup do
         @user = Factory(:user)
       end
-  
+
       should "change password" do
         should_be_validated @user, "secret"
         @user.reset_password!("changed","changed")
         should_be_validated @user, "changed", "password was not changed properly on the LDAP sevrer"
       end
-    
+
       should "not allow to change password if setting is false" do
         should_be_validated @user, "secret"
         ::Devise.ldap_update_password = false
@@ -58,42 +58,67 @@ class UserTest < ActiveSupport::TestCase
         should_be_validated @user, "secret"
       end
     end
-  
+
     context "create new local user if user is in LDAP" do
-    
+
       setup do
         assert(User.all.blank?, "There shouldn't be any users in the database")
       end
-    
+
       should "don't create user in the database" do
         @user = User.authenticate_with_ldap(:email => "example.user@test.com", :password => "secret")
         assert(User.all.blank?)
       end
-    
+
       context "creating users is enabled" do
         setup do
           ::Devise.ldap_create_user = true
         end
-      
+
         should "create a user in the database" do
           @user = User.authenticate_with_ldap(:email => "example.user@test.com", :password => "secret")
           assert_equal(User.all.size, 1)
           assert_contains(User.all.collect(&:email), "example.user@test.com", "user not in database")
         end
-  
+
         should "not create a user in the database if the password is wrong_secret" do
           @user = User.authenticate_with_ldap(:email => "example.user", :password => "wrong_secret")
           assert(User.all.blank?, "There's users in the database")
         end
-      
+
         should "create a user if the user is not in LDAP" do
           @user = User.authenticate_with_ldap(:email => "wrong_secret.user@test.com", :password => "wrong_secret")
           assert(User.all.blank?, "There's users in the database")
         end
+
+        should "create a user in the database if case insensitivity does not matter" do
+          ::Devise.case_insensitive_keys = false
+          @user = Factory(:user)
+
+          assert_difference "User.count", +1 do
+            User.authenticate_with_ldap(:email => "EXAMPLE.user@test.com", :password => "secret")
+          end
+        end
+
+        should "not create a user in the database if case insensitivity matters" do
+          ::Devise.case_insensitive_keys = [:email]
+          @user = Factory(:user)
+
+          assert_no_difference "User.count" do
+            User.authenticate_with_ldap(:email => "EXAMPLE.user@test.com", :password => "secret")
+          end
+        end
+
+        should "create a user with downcased email in the database if case insensitivity matters" do
+          ::Devise.case_insensitive_keys = [:email]
+
+          @user = User.authenticate_with_ldap(:email => "EXAMPLE.user@test.com", :password => "secret")
+          assert_contains(User.all.collect(&:email), "example.user@test.com", "user not in database")
+        end
       end
-    
+
     end
-  
+
     context "use groups for authorization" do
       setup do
         @admin = Factory(:admin)
@@ -101,55 +126,55 @@ class UserTest < ActiveSupport::TestCase
         ::Devise.authentication_keys = [:email]
         ::Devise.ldap_check_group_membership = true
       end
-  
+
       should "admin should be allowed in" do
         should_be_validated @admin, "admin_secret"
       end
-    
+
       should "admin should have the proper groups set" do
         assert_contains(@admin.ldap_groups, /cn=admins/, "groups attribute not being set properly")
       end
-    
+
       should "user should not be allowed in" do
         should_not_be_validated @user, "secret"
       end
-      
+
       should "not be validated if group with different attribute is removed" do
         `ldapmodify #{ldap_connect_string} -f ../ldap/delete_authorization_role.ldif`
         should_not_be_validated @admin, "admin_secret"
       end
     end
-  
+
     context "use role attribute for authorization" do
       setup do
         @admin = Factory(:admin)
         @user = Factory(:user)
         ::Devise.ldap_check_attributes = true
       end
-  
+
       should "admin should be allowed in" do
         should_be_validated @admin, "admin_secret"
       end
-    
+
       should "user should not be allowed in" do
         should_not_be_validated @user, "secret"
       end
     end
-    
+
     context "use admin setting to bind" do
       setup do
         @admin = Factory(:admin)
         @user = Factory(:user)
         ::Devise.ldap_use_admin_to_bind = true
       end
-  
+
       should "description" do
         should_be_validated @admin, "admin_secret"
       end
     end
-  
+
   end
-  
+
   context "use uid for login" do
     setup do
       default_devise_settings!
@@ -157,24 +182,24 @@ class UserTest < ActiveSupport::TestCase
       ::Devise.ldap_config = "#{Rails.root}/config/#{"ssl_" if ENV["LDAP_SSL"]}ldap_with_uid.yml"
       ::Devise.authentication_keys = [:uid]
     end
-  
+
     context "description" do
       setup do
         @admin = Factory(:admin)
         @user = Factory(:user, :uid => "example_user")
       end
-  
+
       should "be able to authenticate using uid" do
         should_be_validated @user, "secret"
         should_not_be_validated @admin, "admin_secret"
       end
     end
-    
+
     context "create user" do
       setup do
         ::Devise.ldap_create_user = true
       end
-  
+
       should "create a user in the database" do
         @user = User.authenticate_with_ldap(:uid => "example_user", :password => "secret")
         assert_equal(User.all.size, 1)
@@ -199,22 +224,22 @@ class UserTest < ActiveSupport::TestCase
           should_be_validated Factory(:user, :uid => "example_user"), "secret"
         end
       end
-    end    
+    end
   end
-  
+
   context "using ERB in the config file" do
     setup do
       default_devise_settings!
       reset_ldap_server!
       ::Devise.ldap_config = "#{Rails.root}/config/#{"ssl_" if ENV["LDAP_SSL"]}ldap_with_erb.yml"
     end
-  
+
     context "authenticate" do
       setup do
         @admin = Factory(:admin)
         @user = Factory(:user)
       end
-  
+
       should "be able to authenticate" do
         should_be_validated @user, "secret"
         should_be_validated @admin, "admin_secret"
@@ -235,7 +260,7 @@ class UserTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   context "use username builder" do
     setup do
       default_devise_settings!
@@ -250,5 +275,5 @@ class UserTest < ActiveSupport::TestCase
       should_be_validated @other, "other_secret"
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_ldap_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70110522209540 !ruby/object:Gem::Requirement
+  requirement: &21244260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70110522209540
+  version_requirements: *21244260
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &70110522208060 !ruby/object:Gem::Requirement
+  requirement: &21243760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,7 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70110522208060
+  version_requirements: *21243760
 description: Devise extension to allow authentication via LDAP
 email: curtis.schiewek@gmail.com
 executables: []
@@ -43,6 +43,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -156,85 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Devise extension to allow authentication via LDAP
-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
+test_files: []