devise_ldap_authenticatable 0.1.2 → 0.1.3

data/README.md

@@ -19,7 +19,11 @@ You must use the net-ldap gem and _NOT_ the ruby-net-ldap gem.
 Installation
 ------------
 
-script/plugin install git@github.com:cschiewek/devise\_ldap\_authenticatable.git
+	gem install devise_ldap_authenticatable
+
+and
+	
+	config.gem 'devise_ldap_authenticatable'
 
 Setup
 -----
@@ -85,6 +89,8 @@ In initializer  `config/initializers/devise.rb` :
       # Required
       config.ldap_host = 'ldap.mydomain.com'
       config.ldap_port = 389
+	  config.ldap_base_dn = 'ou=People,dc=local'
+	  config.ldap_login_attribute = 'uid'
 	
 	  # Optional, these will default to false or nil if not set
 	  config.ldap_ssl = true
@@ -93,10 +99,26 @@ In initializer  `config/initializers/devise.rb` :
 
 * ldap\_host
 	* The host of your LDAP server
+	
 * ldap\_port
-	* The port your LDAP service is listening on.  No default are set.
+	* The port your LDAP service is listening on.
+	
+* ldap\_base_dn
+	* The DN that is appended to the login before the LDAP bind is performed.
+	
+* ldap\_login_attribute
+	* The attribute that is prepended to the login and the base dn to form the
+	  full DN that is used for the bind.
+	* Example:
+		* config.ldap\_base_dn = 'ou=People,dc=local'
+		* config.ldap\_login_attribute = 'uid'
+		* So when trying to login with 'admin' for example, 'admin' would be
+		  the value stored in login field, but the actual DN used for the bind
+		  would be 'uid=admin,ou=People,dc=local'
+		
 * ldap\_ssl
 	* Enables SSL (ldaps) encryption.  START_TLS encryption will be added when the net-ldap gem adds support for it.
+
 * ldap\_create\_user
 	* If set to true, all valid LDAP users will be allowed to login and an appropriate user record will be created.
       If set to false, you will have to create the user record before they will be allowed to login.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/devise_ldap_authenticatable.rb

@@ -14,13 +14,21 @@ module Devise
   mattr_accessor :ldap_port
   @@ldap_port = nil
   
+  # Base DN
+  mattr_accessor :ldap_base_dn
+  @@ldap_base_dn = nil
+  
+  # Attribute for login
+  mattr_accessor :ldap_login_attribute
+  @@ldap_login_attribute = nil
+  
   # Use SSL
   mattr_accessor :ldap_ssl
   @@ldap_ssl = false
   
   # Add valid users to database
   mattr_accessor :ldap_create_user
-  @ldap_create_user = false
+  @@ldap_create_user = false
 end
 
 # Add ldap_authenticatable strategy to defaults.

data/lib/devise_ldap_authenticatable/ldap_adapter.rb

@@ -7,6 +7,7 @@ module Devise
   module LdapAdapter
 
     def self.valid_credentials?(login, password)
+      login = ::Devise.ldap_login_attribute+'='+login+','+::Devise.ldap_base_dn      
       @encryption = ::Devise.ldap_ssl ? :simple_tls : nil
       ldap = Net::LDAP.new(:encryption => @encryption)
       ldap.host = ::Devise.ldap_host

data/lib/devise_ldap_authenticatable/model.rb

@@ -32,7 +32,7 @@ module Devise
         # Authenticate a user based on configured attribute keys. Returns the
         # authenticated user if it's valid or nil.
         def authenticate_with_ldap(attributes={})
-          return unless attributes[:login].present?
+          return unless attributes[:login].present? 
           conditions = attributes.slice(:login)
 
           unless conditions[:login]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Curtis Schiewek