devise_ldap_authenticatable 0.1.3 → 0.1.6

data/README.md

@@ -50,7 +50,7 @@ then the model :
       devise :ldap_authenticatable, :rememberable, :trackable, :timeoutable
 
       # Setup accessible (or protected) attributes for your model
-      attr_accessible :login, :password, :remember_me
+      attr_accessible :login, :ldap_attributes, :password, :remember_me
       ...
     end
 
@@ -62,16 +62,18 @@ and finally change the authentication key in the devise initializer :
 	  ...
 	end
 
+The string stored in ldap_attributes will be inserted between the login and base to provide the full dn used to bind.
 I recommend using :rememberable, :trackable, :timeoutable as it gives a full feature set for logins.
 
 Usage
 -----
 
-Devise LDAP Authenticatable works in replacement of Authenticatable, allowing for LDAP authentication via simple bind. The standard sign\_in routes and views work out of the box as these are just reused from devise. I recommend you run :
+Devise LDAP Authenticatable works in replacement of Authenticatable, 
+but because we have to change the authentication\_keys, you'll need to run:
 
     script/generate devise_views
 
-so you can customize your login pages.
+and customize your login pages to use :login, instead of :email.
 
 ------------------------------------------------------------
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.6

data/devise_ldap_authenticatable.gemspec

@@ -0,0 +1,60 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{devise_ldap_authenticatable}
+  s.version = "0.1.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Curtis Schiewek"]
+  s.date = %q{2010-07-22}
+  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/ldap_adapter.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",
+     "rails/init.rb",
+     "test/devise_ldap_authenticatable_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/cschiewek/devise_ldap_authenticatable}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{LDAP authentication module for Devise}
+  s.test_files = [
+    "test/devise_ldap_authenticatable_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  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.0.4"])
+      s.add_runtime_dependency(%q<net-ldap>, [">= 0.0.0"])
+    else
+      s.add_dependency(%q<devise>, ["> 1.0.4"])
+      s.add_dependency(%q<net-ldap>, [">= 0.0.0"])
+    end
+  else
+    s.add_dependency(%q<devise>, ["> 1.0.4"])
+    s.add_dependency(%q<net-ldap>, [">= 0.0.0"])
+  end
+end
+

data/lib/devise_ldap_authenticatable/ldap_adapter.rb

@@ -6,8 +6,10 @@ module Devise
   # ::Devise.ldap_host
   module LdapAdapter
 
-    def self.valid_credentials?(login, password)
-      login = ::Devise.ldap_login_attribute+'='+login+','+::Devise.ldap_base_dn      
+    def self.valid_credentials?(login, attributes, password)
+      login = "#{::Devise.ldap_login_attribute}=#{login},"
+      login += "#{attributes}," unless attributes.nil?
+      login += ::Devise.ldap_base_dn
       @encryption = ::Devise.ldap_ssl ? :simple_tls : nil
       ldap = Net::LDAP.new(:encryption => @encryption)
       ldap.host = ::Devise.ldap_host
@@ -16,7 +18,6 @@ module Devise
       if ldap.bind
         true
       else
-        # errors.add_to_base(ldap.get_operation_result.message)
         false
       end
     end

data/lib/devise_ldap_authenticatable/model.rb

@@ -25,7 +25,7 @@ module Devise
 
       # Checks if a resource is valid upon authentication.
       def valid_ldap_authentication?(password)
-        Devise::LdapAdapter.valid_credentials?(self.login, password)
+        Devise::LdapAdapter.valid_credentials?(self.login, self.ldap_attributes, password)
       end
 
       module ClassMethods

data/lib/devise_ldap_authenticatable/schema.rb

@@ -6,7 +6,8 @@ Devise::Schema.class_eval do
     def ldap_authenticatable(options={})
       null = options[:null] || false
 
-      apply_schema :login, String, :null => null
+      apply_schema :login, String, :null => false
+      apply_schema :ldap_attributes, String, :null => true
     end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_ldap_authenticatable
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Curtis Schiewek
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -04:00
+date: 2010-07-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: net-ldap
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 0
@@ -58,6 +63,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- devise_ldap_authenticatable.gemspec
 - lib/devise_ldap_authenticatable.rb
 - lib/devise_ldap_authenticatable/ldap_adapter.rb
 - lib/devise_ldap_authenticatable/model.rb
@@ -77,23 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: LDAP authentication module for Devise