derfred-rubycas-client 2.0.9992 → 2.0.9993

data/lib/casclient/frameworks/rails/filter.rb

@@ -39,6 +39,20 @@ module CASClient
           @@log = client.log
         end
 
+        # this guesses the service_url which is requesting the login
+        def self.read_service_url(controller)
+          if config[:service_url]
+            log.debug("Using explicitly set service url: #{config[:service_url]}")
+            return config[:service_url]
+          end
+
+          params = controller.params.dup
+          params.delete(:ticket)
+          service_url = controller.url_for(params)
+          log.debug("Guessed service url: #{service_url.inspect}")
+          return service_url
+        end
+
         # Returns the login URL for the current controller. 
         # Useful when you want to provide a "Login" link in a GatewayFilter'ed
         # action. 

data/lib/casclient/frameworks/rails/request_handler.rb

@@ -17,10 +17,9 @@ module CASClient
         def handle_request
           return :single_sign_out if single_sign_out?(@controller)
 
-          st, require_validation = determine_request_context(@controller)
-
+          st = determine_request_context(@controller)
           if st
-            handle_ticket(@controller, st, require_validation)
+            handle_ticket(@controller, st)
           else
             handle_no_ticket(@controller)
           end
@@ -40,12 +39,12 @@ module CASClient
 
         private
           # high level request handlers
-          def handle_ticket(controller, st, require_validation)
-            st = client.validate_service_ticket(st) if require_validation and not st.has_been_validated?
+          def handle_ticket(controller, st)
+            st = client.validate_service_ticket(st) unless st.has_been_validated?
             vr = st.response
 
-            if !require_validation or st.is_valid?
-              setup_new_session(controller, st, vr) if require_validation
+            if st.is_valid?
+              setup_new_session(controller, st, vr)
 
               # Store the ticket in the session to avoid re-validating the same service
               # ticket with the CAS server.
@@ -204,8 +203,6 @@ module CASClient
             last_st = controller.session[:cas_last_valid_ticket]
             st = read_ticket(controller)
 
-            require_validation = true
-
             if st && last_st && 
                 last_st.ticket == st.ticket && 
                 last_st.service == st.service
@@ -214,7 +211,6 @@ module CASClient
               # the same ticket happens to be in the URL.
               log.warn("Re-using previously validated ticket since the ticket id and service are the same.")
               st = last_st
-              require_validation = false
             elsif last_st &&
                 !config[:authenticate_on_every_request] && 
                 controller.session[client.username_session_key]
@@ -226,15 +222,13 @@ module CASClient
               log.debug "Existing local CAS session detected for #{controller.session[client.username_session_key].inspect}. "+
                 "Previous ticket #{last_st.ticket.inspect} will be re-used."
               st = last_st
-              require_validation = false
             elsif last_st &&
                 config[:authenticate_on_every_request] && 
                 controller.session[client.username_session_key]
               st = last_st
-              require_validation = true
             end
 
-            [st, require_validation]
+            st
           end
 
           def read_ticket(controller)
@@ -268,7 +262,7 @@ module CASClient
             log.info("Ticket #{st.ticket.inspect} for service #{st.service.inspect} belonging to user #{vr.user.inspect} is VALID.")
             controller.session[client.username_session_key] = vr.user.dup
             controller.session[client.extra_attributes_session_key] = HashWithIndifferentAccess.new(vr.extra_attributes.dup)
-            
+
             if vr.extra_attributes
               log.debug("Extra user attributes provided along with ticket #{st.ticket.inspect}: #{vr.extra_attributes.inspect}.")
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: derfred-rubycas-client
 version: !ruby/object:Gem::Version 
-  version: 2.0.9992
+  version: 2.0.9993
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -66,6 +66,7 @@ files:
 - setup.rb
 has_rdoc: true
 homepage: http://rubycas-client.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubycas-client
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Client library for the Central Authentication Service (CAS) protocol.