adauth 1.2.0 → 1.2.1

data/lib/adauth.rb

@@ -1,4 +1,5 @@
 require 'net/ldap'
+require 'timeout'
 require 'adauth/version'
 require 'adauth/user'
 require 'adauth/config'

data/lib/adauth/connection.rb

@@ -21,10 +21,16 @@ module Adauth
                                     :auth => { :username => "#{login}@#{Adauth.config.domain}",
                                         :password => pass,
                                         :method => :simple }
-            if conn.bind
-                return conn
-            else
-                return nil
+            begin
+                Timeout::timeout(10){
+                    if conn.bind
+                        return conn
+                    else
+                        return nil
+                    end
+                }
+            rescue Timeout::Error
+                raise "Unable to connect to LDAP Server"
             end
         end
     end

data/lib/adauth/group.rb

@@ -42,7 +42,7 @@ module Adauth
         #
         # Returns an array of Adauth::Users for the group
         def members
-            filters = Net::LDAP::Filter.construct("(memberOf=#{dn})")
+            filters = Net::LDAP::Filter.eq("memberof","CN=#{name},#{dn}")
             members_ldap = @conn.search(:filter => filters)
             members = []
             members_ldap.each do |member|

data/lib/adauth/user.rb

@@ -81,7 +81,7 @@ module Adauth
                 define_method(k) do
                     if @entry.attribute_names.include?(val)
                         if block.is_a?(Proc)
-                            return block[@entry.send(val).to_s]
+                            return block[@entry.send(val)]
                         else
                             return @entry.send(val).to_s
                         end

data/lib/adauth/user_model.rb

@@ -36,7 +36,7 @@ module Adauth
 	    # This method is called on login and shouldn't need to be called at any other time
 	    def update_from_adauth(adauth_user)
 	        self.group_strings = adauth_user.groups.join(", ")
-	        self.name = adauth_user.name
+	        self.name = adauth_user.name.gsub(/\"|\[|\]/, "")
 	        self.save
         end
 	    
@@ -52,7 +52,7 @@ module Adauth
 	        #
 	        # If the user has no user record in the database one will be created. All the details on the record (new and old) will be updated to the lastest details from the AD server
 	        def return_and_create_with_adauth(adauth_user)
-                user = (find_by_login(adauth_user.login) || create_user_with_adauth(adauth_user))
+                user = (find_by_login(adauth_user.login.gsub(/\"|\[|\]/, "")) || create_user_with_adauth(adauth_user))
                 user.update_from_adauth(adauth_user)
                 return user
             end
@@ -65,12 +65,12 @@ module Adauth
             # Takes the Adauth::User input and creates a user record with matching details
             def create_user_with_adauth(adauth_user)
         		create! do |user|
-        			user.login = adauth_user.login
+        			user.login = adauth_user.login.gsub(/\"|\[|\]/, "")
         			user.group_strings = adauth_user.groups.join(", ")
         			user.ou_strings = adauth_user.ous.join(", ")
-        			user.name = adauth_user.name
+        			user.name = adauth_user.name.gsub(/\"|\[|\]/, "")
         		end
         	end 
         end
     end
-end
+end

data/lib/adauth/version.rb

@@ -1,5 +1,5 @@
 module Adauth
     
     # The version of the gem
-    Version = "1.2.0"
+    Version = "1.2.1"
 end

data/spec/adauth_user_spec.rb

@@ -196,4 +196,18 @@ describe Adauth, "passwordless_login" do
     it "should be a viable user when passwordless login is used" do
         Adauth.passwordless_login(@yaml["user"]["login"]).login.should eq(@yaml["user"]["login"])
     end
+    
+    it "should raise an exception on timeout" do
+        Adauth.configure do |c|
+            c.domain = @yaml["domain"]["domain"]
+            c.server = "127.0.0.2"
+            c.port = @yaml["domain"]["port"]
+            c.base = @yaml["domain"]["base"]
+            c.admin_user = @yaml["domain"]["admin_user"]
+            c.admin_password = @yaml["domain"]["admin_password"]
+        end
+        
+        lambda { Adauth::AdminConnection.bind }.should raise_error
+        
+    end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adauth
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 +01:00
+date: 2012-01-30 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency