oa-enterprise 0.2.0.beta2 → 0.2.0.beta3

data/README.rdoc

@@ -25,7 +25,7 @@ See OmniAuth::Strategies::CAS::Configuration for more configuration options.
 
 == LDAP
 
-Use the LDAP strategy as a middleware in your applicaiton:
+Use the LDAP strategy as a middleware in your application:
 
     require 'omniauth/enterprise'
     use OmniAuth::Strategies::LDAP, 

data/lib/omniauth/strategies/cas.rb

@@ -9,7 +9,7 @@ module OmniAuth
       autoload :ServiceTicketValidator, 'omniauth/strategies/cas/service_ticket_validator'
       
       def initialize(app, options = {}, &block)
-        super(app, options.delete(:name) || :cas, options, &block)
+        super(app, options[:name] || :cas, options.dup, &block)
         @configuration = OmniAuth::Strategies::CAS::Configuration.new(options)
       end
       

data/lib/omniauth/strategies/ldap.rb

@@ -55,7 +55,11 @@ module OmniAuth
       	begin
         creds = session.delete 'omniauth.ldap'
 				@ldap_user_info = {}
-        (@adaptor.bind unless @adaptor.bound?) rescue puts "failed to bind with the default credentials"          
+        begin 
+        	(@adaptor.bind(:allow_anonymous => true) unless @adaptor.bound?) 
+        rescue Exception => e 
+        	puts "failed to bind with the default credentials: " + e.message
+       	end          
         @ldap_user_info = @adaptor.search(:filter => Net::LDAP::Filter.eq(@adaptor.uid, @name_proc.call(creds['username'])),:limit => 1) if @adaptor.bound?
 				bind_dn = creds['username']
 				bind_dn = @ldap_user_info[:dn].to_a.first if @ldap_user_info[:dn]
@@ -65,10 +69,10 @@ module OmniAuth
 
         @env['omniauth.auth'] = auth_hash
 	
-	      call_app!
       	rescue Exception => e
-      	  fail!(:invalid_credentials, e)
+      	  return fail!(:invalid_credentials, e)
       	end
+	      call_app!
       end      
       
       def auth_hash

data/lib/omniauth/strategies/ldap/adaptor.rb

@@ -15,7 +15,7 @@ module OmniAuth
 		class ConnectionError < StandardError; end
 	      
         VALID_ADAPTER_CONFIGURATION_KEYS = [:host, :port, :method, :bind_dn, :password,
-	                                        :try_sasl, :sasl_mechanisms, :uid, :base]
+	                                        :try_sasl, :sasl_mechanisms, :uid, :base, :allow_anonymous]
 	      
         MUST_HAVE_KEYS = [:host, :port, :method, :uid, :base]
 	      
@@ -33,15 +33,17 @@ module OmniAuth
 	      @disconnected = false
 	      @bound = false
 	      @configuration = configuration.dup
-          @logger = @configuration.delete(:logger)
-          message = []
-          MUST_HAVE_KEYS.each do |name|
-              message << name if configuration[name].nil? 
-          end
-          raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
+        @configuration[:allow_anonymous] ||= false          
+        @logger = @configuration.delete(:logger)
+        message = []
+        MUST_HAVE_KEYS.each do |name|
+            message << name if configuration[name].nil? 
+        end
+        raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
           VALID_ADAPTER_CONFIGURATION_KEYS.each do |name|
             instance_variable_set("@#{name}", configuration[name])
           end
+
 	    end
 	
 		def connect(options={})
@@ -81,14 +83,21 @@ module OmniAuth
 
 		    bind_dn = (options[:bind_dn] || @bind_dn).to_s
 		    try_sasl = options.has_key?(:try_sasl) ? options[:try_sasl] : @try_sasl
-		
+		    if options.has_key?(:allow_anonymous)
+          allow_anonymous = options[:allow_anonymous]
+        else
+          allow_anonymous = @allow_anonymous
+        end
             # Rough bind loop:
             # Attempt 1: SASL if available
             # Attempt 2: SIMPLE with credentials if password block
+        		# Attempt 3: SIMPLE ANONYMOUS if 1 and 2 fail and allow anonymous is set to true            
             if try_sasl and sasl_bind(bind_dn, options)
-                puts "bind with sasl"
+                puts "bound with sasl"
             elsif simple_bind(bind_dn, options)
-                puts "bind with simple"
+                puts "bound with simple"
+						elsif allow_anonymous and bind_as_anonymous(options)
+							puts "bound as anonymous"
             else
               message = yield if block_given?
               message ||= ('All authentication methods for %s exhausted.') % target
@@ -242,12 +251,19 @@ module OmniAuth
 	      args = {
                   :method => :simple,
                   :username => bind_dn,
-                  :password => options[:password]||@password,
+                  :password => (options[:password]||@password).to_s,
                  }
+        begin
           execute(:bind, args)
           true
+        rescue Exception
+          false
         end
-	      
+      end
+      def bind_as_anonymous(options={})
+        execute(:bind, {:method => :anonymous})
+        true
+      end	      
       def construct_uri(host, port, ssl)
         protocol = ssl ? "ldaps" : "ldap"
         URI.parse("#{protocol}://#{host}:#{port}").to_s

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oa-enterprise
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - beta2
-  version: 0.2.0.beta2
+  prerelease: 6
+  version: 0.2.0.beta3
 platform: ruby
 authors: 
 - James A. Rosen
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -06:00
+date: 2011-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        - beta2
-        version: 0.2.0.beta2
+        version: 0.2.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -42,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
   type: :runtime
   prerelease: false
@@ -57,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   prerelease: false
@@ -72,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   prerelease: false
@@ -87,11 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
-        - 1
         version: 0.0.3.1
   type: :runtime
   prerelease: false
@@ -103,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -116,10 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
         version: 0.0.8
   type: :development
   prerelease: false
@@ -131,10 +98,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   prerelease: false
@@ -146,10 +109,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 4
         version: 1.3.4
   type: :development
   prerelease: false
@@ -161,10 +120,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 4
         version: 0.5.4
   type: :development
   prerelease: false
@@ -176,10 +131,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
         version: 1.4.3
   type: :development
   prerelease: false
@@ -215,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2545476122295701716
+      hash: -3005094770643845587
       segments: 
       - 0
       version: "0"
@@ -224,15 +175,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Enterprise strategies for OmniAuth.