Improve service ticket validation

Author: Robert Mitwicki

lib/rubycas-server-core/tickets/validations.rb

@@ -4,7 +4,7 @@ module Validations
 
     # Validate login ticket
     #
-    # Returned [succes, error_message]
+    # Returned [success, error_message]
     def validate_login_ticket(ticket)
       $LOG.debug "Validating login ticket '#{ticket}'"
       success = false
@@ -55,6 +55,8 @@ def validate_ticket_granting_ticket(ticket)
 
     def validate_service_ticket(service, ticket, allow_proxy_tickets = false)
       $LOG.debug "Validating service/proxy ticket '#{ticket}' for service '#{service}'"
+      success = false
+      error = nil
 
       if service.nil? or ticket.nil?
         error = Error.new(:INVALID_REQUEST, "Ticket or service parameter was missing in the request.")
@@ -74,19 +76,16 @@ def validate_service_ticket(service, ticket, allow_proxy_tickets = false)
             " but the requested service '#{service}' does not match the service '#{st.service}' associated with this ticket.")
           $LOG.warn "#{error.code} - #{error.message}"
         else
+          st.consume!
+          success = true
           $LOG.info("Ticket '#{ticket}' for service '#{service}' for user '#{st.username}' successfully validated.")
         end
       else
         error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' not recognized.")
         $LOG.warn("#{error.code} - #{error.message}")
       end
 
-      if st
-        st.consume!
-      end
-
-
-      [st, error]
+      return [success, error]
     end
 
     def validate_proxy_ticket(service, ticket)

spec/rubycas-server-core/tickets/validations_spec.rb

@@ -16,7 +16,7 @@
     it "should validate login ticket" do
       @lt = Tickets.generate_login_ticket(@client_hostname)
       success, error = @cas.validate_login_ticket(@lt.ticket)
-      success.should be_true
+      success.should be_truthy
       error.should be_nil
     end
   end
@@ -30,7 +30,7 @@
 
     it "should validate ticket granting ticket" do
       success, error = @cas.validate_ticket_granting_ticket(@tgt.ticket)
-      success.should be_true
+      success.should be_truthy
       error.should be_nil
     end
   end
@@ -46,7 +46,7 @@
 
     it "should validate service ticket" do
       success, error = @cas.validate_service_ticket(@service, @st.ticket)
-      success.should be_true
+      success.should be_truthy
       error.should be_nil
     end
   end