oa-enterprise 0.2.0.beta4 → 0.2.0.beta5

data/lib/oa-enterprise.rb

@@ -0,0 +1 @@
+require 'omniauth/enterprise'

data/lib/omniauth/strategies/cas.rb

@@ -28,10 +28,10 @@ module OmniAuth
 
       def callback_phase
         ticket = request.params['ticket']
-        return fail!(:no_ticket) unless ticket
+        return fail!(:no_ticket, 'No CAS Ticket') unless ticket
         validator = ServiceTicketValidator.new(@configuration, callback_url, ticket)
         @user_info = validator.user_info
-        return fail!(:invalid_ticket) if @user_info.nil? || @user_info.empty?
+        return fail!(:invalid_ticket, 'Invalid CAS Ticket') if @user_info.nil? || @user_info.empty?
         super
       end
       
@@ -41,7 +41,7 @@ module OmniAuth
           'extra' => @user_info
         })
       end
-      
+
     end
   end
 end

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

@@ -18,6 +18,8 @@ module OmniAuth
         # @option params [String, nil] :cas_service_validate_url (:cas_server + '/serviceValidate') the
         #         URL to use for validating service tickets; optional if `:cas_server` is
         #         specified, requred otherwise.
+        # @option params [Boolean, nil] :disable_ssl_verification disable verification for SSL cert,
+        #         helpful when you developing with a fake cert.
         def initialize(params)
           parse_params params
         end
@@ -32,16 +34,24 @@ module OmniAuth
         end
 
         # Build a service-validation URL from +service+ and +ticket+.
+        # If +service+ has a ticket param, first remove it. URL-encode
+        # +service+ and add it and the +ticket+ as paraemters to the
+        # CAS serviceValidate URL.
         #
         # @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=...`
         def service_validate_url(service, ticket)
-          url = append_service @service_validate_url, service
+          service = service.sub(/[?&]ticket=[^?&]+/, '')
+          url = append_service(@service_validate_url, service)
           url << '&ticket=' << Rack::Utils.escape(ticket)
         end
 
+        def disable_ssl_verification?
+          @disable_ssl_verification
+        end
+
         private
 
         def parse_params(params)
@@ -58,6 +68,8 @@ module OmniAuth
           @service_validate_url   = params[:cas_service_validate_url]
           @service_validate_url ||= DEFAULT_SERVICE_VALIDATE_URL % params[:cas_server]
           validate_is_url 'service-validate URL', @service_validate_url
+
+          @disable_ssl_verification = params[:disable_ssl_verification]
         end
 
         IS_NOT_URL_ERROR_MESSAGE = "%s is not a valid URL"

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

@@ -14,7 +14,8 @@ module OmniAuth
         # @param [String] return_to_url the URL of this CAS client service
         # @param [String] ticket the service ticket to validate
         def initialize(configuration, return_to_url, ticket)
-          @uri = URI.parse(configuration.service_validate_url(return_to_url, ticket))
+          @configuration = configuration
+          @uri = URI.parse(@configuration.service_validate_url(return_to_url, ticket))
         end
 
         # Request validation of the ticket from the CAS server's
@@ -30,7 +31,7 @@ module OmniAuth
         end
 
         private
-        
+
         # turns an `<cas:authenticationSuccess>` node into a Hash;
         # returns nil if given nil
         def parse_user_info(node)
@@ -67,8 +68,9 @@ module OmniAuth
           result = ''
           http = Net::HTTP.new(@uri.host, @uri.port)
           http.use_ssl = @uri.port == 443 || @uri.instance_of?(URI::HTTPS)
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl? && @configuration.disable_ssl_verification?
           http.start do |c|
-            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS
+            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS.dup
             result = response.body
           end
           result

metadata

@@ -2,7 +2,7 @@
 name: oa-enterprise
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta4
+  version: 0.2.0.beta5
 platform: ruby
 authors: 
 - James A. Rosen
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -06:00
+date: 2011-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0.beta4
+        version: 0.2.0.beta5
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/oa-enterprise.rb
 - lib/omniauth/enterprise.rb
 - lib/omniauth/strategies/cas/configuration.rb
 - lib/omniauth/strategies/cas/service_ticket_validator.rb
@@ -166,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3364161310048939342
+      hash: -2736009096566092048
       segments: 
       - 0
       version: "0"