rack-cas 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b3f4f0aa58877ed7a2d4c3461f29cf61627373
-  data.tar.gz: 1957151a852757147c97e0c8bffcb2d3f9388f44
+  metadata.gz: b512d0ffca0a80b935d7f6aaf73c5b7ddc9fea4e
+  data.tar.gz: 0f0e27f8c8a5a30b1dcace4ebfb7da94312fe293
 SHA512:
-  metadata.gz: cae156d6cad7408f836e3bdb206b287c26af315d1364d9addba79cad801f2e19347b57be115940d900cf0b572d0340c6bf100fa30175138ea474cd4b1d9bd31f
-  data.tar.gz: f343a2ea383015d349955d4a69278065e0ed03888564bddd837de5352c6b64fe12838001033ccfe7cf5db6ab861f1c010ae77feb9757486f51e62a1d56f846c3
+  metadata.gz: 181b529b5eb80f72e4b47b7b501fbb56424dd344170e4fab0ea60d7850f9936f05309eaa141af10cc5ae466b5de27340a8d1bea6cd5742a7127b5290a451089c
+  data.tar.gz: 65c877333d00ee77ebd0356a90198d63f10582667a710fdc8e10402c1fa618283d863aee554769fa2426b445c10ff4c8a6d1abf7aaff241ceb97e93f5bc80844

data/lib/rack-cas/service_validation_response.rb

@@ -1,9 +1,12 @@
 module RackCAS
   class ServiceValidationResponse
     class AuthenticationFailure < StandardError; end
+    class RequestInvalidError < AuthenticationFailure; end
+    class TicketInvalidError < AuthenticationFailure; end
+    class ServiceInvalidError < AuthenticationFailure; end
 
     REQUEST_HEADERS = { 'Accept' => '*/*' }
-    
+
     def initialize(url)
       @url = URL.parse(url)
     end
@@ -12,7 +15,16 @@ module RackCAS
       if success?
         xml.xpath('/cas:serviceResponse/cas:authenticationSuccess/cas:user').text
       else
-        raise AuthenticationFailure, failure_message
+        case failure_code
+        when 'INVALID_REQUEST'
+          raise RequestInvalidError, failure_message
+        when 'INVALID_TICKET'
+          raise TicketInvalidError, failure_message
+        when 'INVALID_SERVICE'
+          raise ServiceInvalidError, failure_message
+        else
+          raise AuthenticationFailure, failure_message
+        end
       end
     end
 
@@ -50,16 +62,26 @@ module RackCAS
       @success ||= !!xml.at('/cas:serviceResponse/cas:authenticationSuccess')
     end
 
+    def authentication_failure
+      @authentication_failure ||= xml.at('/cas:serviceResponse/cas:authenticationFailure')
+    end
+
     def failure_message
-      if node = xml.at('/cas:serviceResponse/cas:authenticationFailure')
-        node.text.strip
+      if authentication_failure
+        authentication_failure.text.strip
+      end
+    end
+
+    def failure_code
+      if authentication_failure
+        authentication_failure['code']
       end
     end
 
     def response
       require 'net/http'
       return @response unless @response.nil?
-      
+
       http = Net::HTTP.new(@url.host, @url.inferred_port)
       http.use_ssl = true if @url.scheme == 'https'
 
@@ -72,8 +94,8 @@ module RackCAS
 
     def xml
       return @xml unless @xml.nil?
-      
+
       @xml = Nokogiri::XML(response.body)
     end
   end
-end
+end

data/lib/rack-cas/version.rb

@@ -1,3 +1,3 @@
 module RackCAS
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/rack/cas.rb

@@ -23,13 +23,19 @@ class Rack::CAS
     cas_request = CASRequest.new(request)
 
     if cas_request.path_matches? @config[:exclude_paths] || @config[:exclude_path]
-      return @app.call(env) 
+      return @app.call(env)
     end
 
     if cas_request.ticket_validation?
       log env, 'rack-cas: Intercepting ticket validation request.'
 
-      user, extra_attrs = get_user(request.url, cas_request.ticket)
+      begin
+        user, extra_attrs = get_user(request.url, cas_request.ticket)
+      rescue RackCAS::ServiceValidationResponse::TicketInvalidError
+        log env, 'rack-cas: Invalid ticket. Redirecting to CAS login.'
+
+        return redirect_to server.login_url(cas_request.service_url).to_s
+      end
 
       store_session request, user, cas_request.ticket, extra_attrs
       return redirect_to cas_request.service_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cas
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack