oa-ldap 0.0.1 → 0.0.2

data/lib/omniauth/strategies/ldap.rb

@@ -1,6 +1,8 @@
-require 'net/ldap'
+#require 'net/ldap'
+require 'ldap'
 require 'omniauth/core'
 
+
 module OmniAuth
   module Strategies
     class LDAP
@@ -9,58 +11,110 @@ module OmniAuth
       def initialize(app, name, host, port, base, options = {})
         @options = options
         @base = base
-        @identifier_key = options[:identifier_key] || "uid"
+        @uid_key = options[:identifier_key] || "uid"
+
+        @auth = nil
+        @host = host
+        @port = port
 
-        @ldap = Net::LDAP.new(:host => host, :port => port)        
         if options[:username] && options[:password]
-          @ldap.auth options[:username], options[:password]
+          @auth = {:method => :simple,
+            :username => options[:username],
+            :password => options[:password]}
         end
 
         super(app, name)
       end
 
+      def connect
+      end
 
-      def request_phase
-        return fail!(:missing_information) unless (request[:identifier] && request[:password])
-        
 
-        result = @ldap.bind_as(:base => @base,
-                               :filter => "(#{@identifier_key}=#{request[:identifier]})",
-                               :password => request[:password])
-        
+      def bind(username, password)
+        filter = "(#{@uid_key}=#{username})"
 
+        ldap = Net::LDAP.new(:host => @host, :port => @port, :auth => @auth)
+        result = ldap.bind_as(:base => @base,
+                              :filter => filter,
+                              :password => password)
         if result
-          env['REQUEST_METHOD'] = 'GET'
-          env['PATH_INFO'] = request.path + '/callback'
-          request['auth'] = auth_hash(result.first)
-          @app.call(env)
+          result.first.inspect
         else
-          fail!(:invalid_credentials)
+          false
+        end
+      end
+
+      def bind_jruby(username, password)
+
+        begin
+          conn = ::LDAP::Conn.new(host=@host, port=@port)
+          dn = "#{@uid_key}=#{username},#{@base}"
+          
+          result = false
+          
+          conn.bind(dn=dn, password=password, method=::LDAP::LDAP_AUTH_SIMPLE) do
+            conn.search(dn, ::LDAP::LDAP_SCOPE_BASE, "(&(objectclass=person))",
+                        ["name","email","displayName"]) do |entry|
+
+              result = entry
+            end          
+          end
+          
+          result = result.inspect
+          
+          @user_info = entry_map result
+          @user_info[@uid_key] = username        
+          @ldap_user_info = result
+          return result
+          
+        rescue
+          false
         end
+      end
+
+      def request_phase
+        return fail!(:missing_information) unless (request[:username] && request[:password])
+
+        result = bind_jruby(request[:username], request[:password])
+          
+        if result
+          @env['REQUEST_METHOD'] = 'GET'
+          @env['PATH_INFO'] = "#{OmniAuth.config.path_prefix}/#{name}/callback"
+          @env['omniauth.auth'] = auth_hash
 
+          callback_phase
+        else 
+          fail!(:invalid_credentials)
+        end
       end
 
 
-      def auth_hash(entry)
+      def auth_hash
         OmniAuth::Utils.deep_merge(super(), {
-          'uid' => (entry.send @identifier_key)[0],
-          'strategy' => self.class.to_s,                                    
-          'user_info' => {             
-                                       'name' => entry_attr(entry, :name),
-                                       'displayName' => entry_attr(entry, :displayName),
-                                       'uid' =>  entry_attr(entry, :uid),
-                                       'email' => entry_attr(entry, :mail) || entry_attr(entry, :email)
-          }
+                                     'uid' => @user_info["uid"],
+                                     'strategy' => self.class.to_s,
+                                     'user_info' => @user_info,
+                                     'extra' => @ldap_user_info
         })
       end
 
 
-      def callback_phase
-        @app.call(env)
-      end      
+      def entry_map(entry)
+        {             
+          'name' => entry_attr(entry, :name) || entry_attr(entry, :displayName),
+          'displayName' => entry_attr(entry, :displayName),
+          'uid' =>  entry_attr(entry, :uid),
+          'email' => entry_attr(entry, :mail) || entry_attr(entry, :email)
+        }
+      end
 
       def entry_attr(entry, key)
-        (entry.attribute_names.member?(key) && entry.send(key) && (entry.send key)[0]) || nil
+        key = key.to_s
+        if entry[key]
+          entry[key].first
+        else
+          nil
+        end
       end
 
     end

metadata

@@ -3,50 +3,62 @@ name: oa-ldap
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+    - 0
+    - 0
+    - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- Pedro Teixeira
+  - Pedro Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 -03:00
+date: 2010-10-18 00:00:00 -02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: oa-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ldap
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :runtime
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: oa-core
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 0
+              - 3
+            version: 0.0.3
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: net-ldap
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 1
+              - 1
+            version: 0.1.1
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: jruby-ldap
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 0
+              - 1
+            version: 0.0.1
+    type: :runtime
+    version_requirements: *id003
 description: LDAP strategies for OmniAuth.
 email: pedro.t@gmail.com
 executables: []
@@ -56,11 +68,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/omniauth/strategies/ldap.rb
-- lib/omniauth/ldap.rb
-- README.rdoc
-- LICENSE.rdoc
-- CHANGELOG.rdoc
+  - lib/omniauth/ldap.rb
+  - lib/omniauth/strategies/ldap.rb
+  - README.rdoc
+  - LICENSE.rdoc
+  - CHANGELOG.rdoc
 has_rdoc: true
 homepage: http://github.com/pedroteixeira/oa-ldap
 licenses: []
@@ -69,27 +81,25 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: LDAP strategies for OmniAuth.