oa-enterprise 0.1.4 → 0.1.5

data/lib/omniauth/strategies/cas/configuration.rb

@@ -11,12 +11,12 @@ module OmniAuth
 
         # @param [Hash] params configuration options
         # @option params [String, nil] :cas_server the CAS server root URL; probably something like
-        #         'http://cas.mycompany.com' or 'http://cas.mycompany.com/cas'; optional.
+        #         `http://cas.mycompany.com` or `http://cas.mycompany.com/cas`; optional.
         # @option params [String, nil] :cas_login_url (:cas_server + '/login') the URL to which to
-        #         redirect for logins; options if <tt>:cas_server</tt> is specified,
+        #         redirect for logins; options if `:cas_server` is specified,
         #         required otherwise.
         # @option params [String, nil] :cas_service_validate_url (:cas_server + '/serviceValidate') the
-        #         URL to use for validating service tickets; optional if <tt>:cas_server</tt> is
+        #         URL to use for validating service tickets; optional if `:cas_server` is
         #         specified, requred otherwise.
         def initialize(params)
           parse_params params
@@ -26,8 +26,7 @@ module OmniAuth
         #
         # @param [String] service the service (a.k.a. return-to) URL
         # 
-        # @return [String] a URL like
-        # "http://cas.mycompany.com/login?service=..."
+        # @return [String] a URL like `http://cas.mycompany.com/login?service=...`
         def login_url(service)
           append_service @login_url, service
         end
@@ -37,8 +36,7 @@ module OmniAuth
         # @param [String] service the service (a.k.a. return-to) URL
         # @param [String] ticket the ticket to validate
         #
-        # @return [String] a URL like
-        # "http://cas.mycompany.com/serviceValidate?service=...&ticket=..."
+        # @return [String] a URL like `http://cas.mycompany.com/serviceValidate?service=...&ticket=...`
         def service_validate_url(service, ticket)
           url = append_service @service_validate_url, service
           url << '&ticket=' << Rack::Utils.escape(ticket)

data/lib/omniauth/strategies/cas/service_ticket_validator.rb

@@ -31,7 +31,7 @@ module OmniAuth
 
         private
         
-        # turns an <cas:authenticationSuccess> node into a Hash;
+        # turns an `<cas:authenticationSuccess>` node into a Hash;
         # returns nil if given nil
         def parse_user_info(node)
           return nil if node.nil?
@@ -45,8 +45,8 @@ module OmniAuth
           end
         end
         
-        # finds an <cas:authenticationSuccess> node in
-        # a <cas:serviceResponse> body if present; returns nil
+        # finds an `<cas:authenticationSuccess>` node in
+        # a `<cas:serviceResponse>` body if present; returns nil
         # if the passed body is nil or if there is no such node.
         def find_authentication_success(body)
           return nil if body.nil? || body == ''
@@ -62,7 +62,7 @@ module OmniAuth
           end
         end
         
-        # retrieves the <cas:serviceResponse> XML from the CAS server
+        # retrieves the `<cas:serviceResponse>` XML from the CAS server
         def get_service_response_body
           result = ''
           http = Net::HTTP.new(@uri.host, @uri.port)

data/lib/omniauth/strategies/ldap.rb

@@ -1,6 +1,7 @@
 require 'omniauth/enterprise'
 require 'net/ldap'
-
+require 'sasl/base'
+require 'sasl'
 module OmniAuth
   module Strategies
     class LDAP

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

@@ -192,60 +192,14 @@ module OmniAuth
 	          end
 	        false
 			  end
-
-      def parse_sasl_digest_md5_credential(cred)
-        params = {}
-        cred.scan(/(\w+)=(\"?)(.+?)\2(?:,|$)/) do |name, sep, value|
-          params[name] = value
-        end
-        params
-      end			  
-      CHARS = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
-      def generate_client_nonce(size=32)
-        nonce = ""
-        size.times do |i|
-          nonce << CHARS[rand(CHARS.size)]
-        end
-        nonce
-      end      
+ 
       def sasl_bind_setup_digest_md5(bind_dn, options)
         initial_credential = ""
-        nonce_count = 1
         challenge_response = Proc.new do |cred|
-          params = parse_sasl_digest_md5_credential(cred)
-          qops = params["qop"].split(/,/)
-          unless qops.include?("auth")
-            raise ActiveLdap::AuthenticationError,
-                  _("unsupported qops: %s") % qops.inspect
-          end
-          qop = "auth"
-          server = @connection.instance_variable_get("@conn").addr[2]
-          realm = params['realm']
-          uri = "ldap/#{server}"
-          nc = "%08x" % nonce_count
-          nonce = params["nonce"]
-          cnonce = generate_client_nonce
-          requests = {
-            :username => bind_dn.inspect,
-            :realm => realm.inspect,
-            :nonce => nonce.inspect,
-            :cnonce => cnonce.inspect,
-            :nc => nc,
-            :qop => qop,
-            :maxbuf => "65536",
-            "digest-uri" => uri.inspect,
-          }
-          a1 = "#{bind_dn}:#{realm}:#{options[:password]||@password}"
-          a1 = "#{Digest::MD5.digest(a1)}:#{nonce}:#{cnonce}"
-          ha1 = Digest::MD5.hexdigest(a1)
-          a2 = "AUTHENTICATE:#{uri}"
-          ha2 = Digest::MD5.hexdigest(a2)
-          response = "#{ha1}:#{nonce}:#{nc}:#{cnonce}:#{qop}:#{ha2}"
-          requests["response"] = Digest::MD5.hexdigest(response)
-          nonce_count += 1
-          requests.collect do |key, value|
-            "#{key}=#{value}"
-          end.join(",")
+          pref = SASL::Preferences.new :digest_uri => "ldap/#{@host}", :username => bind_dn, :has_password? => true, :password => options[:password]||@password
+          sasl = SASL.new("DIGEST-MD5", pref)
+          response = sasl.receive("challenge", cred)
+          response[1]
         end
         [initial_credential, challenge_response]
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-enterprise
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - James A. Rosen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -05:00
+date: 2010-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -85,6 +85,23 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 65
+        segments: 
+        - 0
+        - 0
+        - 3
+        - 1
+        version: 0.0.3.1
+  requirement: *id005
+  name: pyu-ruby-sasl
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +110,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
   name: rake
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +126,12 @@ dependencies:
         - 0
         - 8
         version: 0.0.8
-  requirement: *id006
+  requirement: *id007
   name: mg
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,12 +142,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id007
+  requirement: *id008
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,12 +158,12 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  requirement: *id008
+  requirement: *id009
   name: webmock
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -157,12 +174,12 @@ dependencies:
         - 5
         - 4
         version: 0.5.4
-  requirement: *id009
+  requirement: *id010
   name: rack-test
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -173,7 +190,7 @@ dependencies:
         - 4
         - 3
         version: 1.4.3
-  requirement: *id010
+  requirement: *id011
   name: json
   prerelease: false
   type: :development