devise_ldap_authenticatable 0.4.10 → 0.5.0

data/.gitignore

@@ -0,0 +1,8 @@
+.bundle
+log
+*.sqlite3
+test/ldap/openldap-data/*
+!test/ldap/openldap-data/run
+test/ldap/openldap-data/run/slapd.*
+test/rails_app/tmp
+pkg/*

data/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem 'devise', '~> 1.5.0'
+gem 'net-ldap', '~> 0.2.2'
+
+platforms :mri_18 do
+  group :test do
+    gem 'ruby-debug', '>= 0.10.3'
+  end
+end

data/Rakefile

@@ -5,25 +5,6 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the devise_imapable plugin.'
-Rake::TestTask.new(:test) do |t|
-  # t.libs << 'lib'
-  # t.libs << 'test'
-  # t.pattern = 'test/**/*_test.rb'
-  # t.verbose = true
-  puts <<-eof
-
-*** NOTICE ***
-
-All tests are done in the sample Rails app. 
-
-Please go to test/rails_app and run the tests there. 
-
-Make sure to bundle install and rake db:migrate
-
-  eof
-end
-
 desc 'Generate documentation for the devise_ldap_authenticatable plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -31,22 +12,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "devise_ldap_authenticatable"
-    gemspec.summary = "LDAP authentication module for Devise"
-    gemspec.description = "LDAP authentication module for Devise"
-    gemspec.email = "curtis.schiewek@gmail.com"
-    gemspec.homepage = "http://github.com/cschiewek/devise_ldap_authenticatable"
-    gemspec.authors = ["Curtis Schiewek", "Daniel McNevin"]
-    gemspec.add_runtime_dependency "devise", "~> 1.4.0"
-    gemspec.add_runtime_dependency "net-ldap", "~> 0.2.2"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+end

data/devise_ldap_authenticatable.gemspec

@@ -1,133 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "devise_ldap_authenticatable/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{devise_ldap_authenticatable}
-  s.version = "0.4.10"
+  s.name     = 'devise_ldap_authenticatable'
+  s.version  = DeviseLdapAuthenticatable::VERSION.dup
+  s.platform = Gem::Platform::RUBY
+  s.summary  = 'Devise extension to allow authentication via LDAP'
+  s.email = 'curtis.schiewek@gmail.com'
+  s.homepage = 'https://github.com/cschiewek/devise_ldap_authenticatable'
+  s.description = s.summary
+  s.authors = ['Curtis Schiewek', 'Daniel McNevin', 'Steven Xu']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Curtis Schiewek", "Daniel McNevin", "Steven Xu"]
-  s.date = %q{2011-10-17}
-  s.description = %q{LDAP authentication module for Devise}
-  s.email = %q{curtis.schiewek@gmail.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "devise_ldap_authenticatable.gemspec",
-    "lib/devise_ldap_authenticatable.rb",
-    "lib/devise_ldap_authenticatable/exception.rb",
-    "lib/devise_ldap_authenticatable/ldap_adapter.rb",
-    "lib/devise_ldap_authenticatable/logger.rb",
-    "lib/devise_ldap_authenticatable/model.rb",
-    "lib/devise_ldap_authenticatable/routes.rb",
-    "lib/devise_ldap_authenticatable/schema.rb",
-    "lib/devise_ldap_authenticatable/strategy.rb",
-    "lib/devise_ldap_authenticatable/version.rb",
-    "lib/generators/devise_ldap_authenticatable/install_generator.rb",
-    "lib/generators/devise_ldap_authenticatable/templates/ldap.yml",
-    "rails/init.rb",
-    "test/devise_ldap_authenticatable_test.rb",
-    "test/ldap/base.ldif",
-    "test/ldap/clear.ldif",
-    "test/ldap/local.schema",
-    "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_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"
-  ]
-  s.homepage = %q{http://github.com/cschiewek/devise_ldap_authenticatable}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{LDAP authentication module for Devise}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<devise>, ["~> 1.4.0"])
-      s.add_runtime_dependency(%q<net-ldap>, ["~> 0.2.2"])
-    else
-      s.add_dependency(%q<devise>, ["~> 1.4.0"])
-      s.add_dependency(%q<net-ldap>, ["~> 0.2.2"])
-    end
-  else
-    s.add_dependency(%q<devise>, ["~> 1.4.0"])
-    s.add_dependency(%q<net-ldap>, ["~> 0.2.2"])
-  end
-end
 
+  s.add_dependency('devise', '~> 1.5.0')
+  s.add_dependency('net-ldap', '~> 0.2.2')
+end

data/lib/devise_ldap_authenticatable/strategy.rb

@@ -5,30 +5,17 @@ module Devise
     # Strategy for signing in a user based on his login and password using LDAP.
     # Redirects to sign_in page if it's not authenticated
     class LdapAuthenticatable < Authenticatable
-      def valid?
-        valid_controller? && valid_params? && mapping.to.respond_to?(:authenticate_with_ldap)
-      end
-
       # Authenticate a user based on login and password params, returning to warden
       # success and the authenticated user if everything is okay. Otherwise redirect
       # to sign in page.
       def authenticate!
-        if resource = mapping.to.authenticate_with_ldap(params[scope])
+        resource = valid_password? && mapping.to.authenticate_with_ldap(params[scope])
+        if validate(resource)
           success!(resource)
         else
           fail(:invalid)
         end
-     end
-
-      protected
-
-        def valid_controller?
-          params[:controller] == mapping.controllers[:sessions]
-        end
-
-        def valid_params?
-          params[scope] && params[scope][:password].present?
-        end
+      end
     end
   end
 end

data/lib/devise_ldap_authenticatable/version.rb

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

data/test/rails_app/config/ldap_with_boolean_ssl.yml

@@ -0,0 +1,22 @@
+authorizations: &AUTHORIZATIONS
+  ## Authorization
+  group_base: ou=groups,dc=test,dc=com
+  required_groups:
+    - cn=admins,ou=groups,dc=test,dc=com
+    - ["authorizationRole", "cn=users,ou=groups,dc=test,dc=com"]
+  require_attribute:
+    objectClass: inetOrgPerson
+    authorizationRole: blogAdmin
+    
+test: &TEST
+  host: localhost
+  port: 3389
+  attribute: cn
+  base: ou=people,dc=test,dc=com
+  admin_user: cn=admin,dc=test,dc=com
+  admin_password: secret
+  ssl: true
+  <<: *AUTHORIZATIONS
+  
+development:
+  <<: *TEST

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_ldap_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14061140 !ruby/object:Gem::Requirement
+  requirement: &13886720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *14061140
+  version_requirements: *13886720
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &14060660 !ruby/object:Gem::Requirement
+  requirement: &13884260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,18 +34,18 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *14060660
-description: LDAP authentication module for Devise
+  version_requirements: *13884260
+description: Devise extension to allow authentication via LDAP
 email: curtis.schiewek@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
 - devise_ldap_authenticatable.gemspec
 - lib/devise_ldap_authenticatable.rb
 - lib/devise_ldap_authenticatable/exception.rb
@@ -63,6 +63,7 @@ files:
 - 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
@@ -94,6 +95,7 @@ files:
 - 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
@@ -134,7 +136,7 @@ files:
 - test/rails_app/test/unit/post_test.rb
 - test/rails_app/test/unit/user_test.rb
 - test/test_helper.rb
-homepage: http://github.com/cschiewek/devise_ldap_authenticatable
+homepage: https://github.com/cschiewek/devise_ldap_authenticatable
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -154,8 +156,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: LDAP authentication module for Devise
+summary: Devise extension to allow authentication via LDAP
 test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.4.10