devise_cas_authenticatable 1.3.2 → 1.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5448fb286452b15ccbd920790c2e460da848493d
+  data.tar.gz: c3d8cd05c1ea43e6339dad9f7533b4122bdf4381
+SHA512:
+  metadata.gz: ef08c90a7c12c002bbab20ce4513a89f6350ed21b9564164ded03c73444250e11830d8678b6e589dd0f00d196181f0d985e1592a90af7f65d955f8266f7205b8
+  data.tar.gz: c059b6cc5aa59cd8cea3f3eb3a0930c28877355ad154b9efe44f341346d712fb1e4d1987bbf803eb240ea91aeac04daa79c5a0664a5b5519085c786d5e89ff25

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.3.3 - December 13, 2013
+
+* Bug fix for single sign out when using Rack >= 1.5 (thanks to @activars)
+
 ## Version 1.3.2 - August 16, 2013
 
 * Rails 4 deprecation warning fix (thanks to @reidmix)

data/README.md

@@ -77,6 +77,10 @@ to tell your app how to talk to your CAS server:
       # config.cas_destination_url = 'https://cas.myorganization.com'
       # config.cas_follow_url = 'https://cas.myorganization.com'
       # config.cas_logout_url_param = nil
+      
+      # You can specify the name of the destination argument with the following option.
+      # e.g. the following option will change it from 'destination' to 'url'
+      # config.cas_destination_logout_param_name = 'url'
 
       # By default, devise_cas_authenticatable will create users.  If you would rather
       # require user records to already exist locally before they can authenticate via

data/app/controllers/devise/cas_sessions_controller.rb

@@ -39,7 +39,8 @@ class Devise::CasSessionsController < Devise::SessionsController
         logger.debug "Intercepted single-sign-out request for CAS session #{session_index}."
         session_id = ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.find_session_id_by_index(session_index)
         if session_id
-          destroy_cas_session(session_id, session_index)
+          logger.debug "Found Session ID #{session_id} with index key #{session_index}"
+          destroy_cas_session(session_index, session_id)
         end
       else
         logger.warn "Ignoring CAS single-sign-out request as no session index could be parsed from the parameters."
@@ -64,12 +65,10 @@ class Devise::CasSessionsController < Devise::SessionsController
     end
   end
 
-  def destroy_cas_session(session_id, session_index)
-    logger.debug "Destroying cas session #{session_id} for ticket #{session_index}"
+  def destroy_cas_session(session_index, session_id)
     if destroy_session_by_id(session_id)
       logger.debug "Destroyed session #{session_id} corresponding to service ticket #{session_index}."
     end
-
     ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.delete_session_index(session_index)
   end
 

data/devise_cas_authenticatable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]

data/lib/devise_cas_authenticatable/single_sign_out.rb

@@ -1,8 +1,8 @@
 module DeviseCasAuthenticatable
   module SingleSignOut
 
-    def self.rails3?
-      defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
+    def self.rails3_or_greater?
+      defined?(::Rails) && ::Rails::VERSION::MAJOR >= 3
     end
 
     # Supports destroying sessions by ID for ActiveRecord and Redis session stores
@@ -10,8 +10,8 @@ module DeviseCasAuthenticatable
       def session_store_class
         @session_store_class ||=
           begin
-            if ::DeviseCasAuthenticatable::SingleSignOut.rails3?
-              # => Rails 3
+            # Rails 3 & 4 session store
+            if ::DeviseCasAuthenticatable::SingleSignOut.rails3_or_greater?
               Rails.configuration.session_store
               ::Rails.application.config.session_store
             else

data/lib/devise_cas_authenticatable/single_sign_out/rack.rb

@@ -2,6 +2,9 @@ module DeviseCasAuthenticatable
   module SingleSignOut
 
     class StoreSessionId
+      CAS_TICKET_STORE = 'cas_last_valid_ticket_store'
+      CAS_LAST_TICKET  = 'cas_last_valid_ticket'
+
       def initialize(app)
         @app = app
       end
@@ -12,19 +15,25 @@ module DeviseCasAuthenticatable
       end
 
       private
-
       def store_session_id_for_cas_ticket(env)
         request = Rack::Request.new(env)
         session = request.session
 
-        if session['cas_last_valid_ticket_store']
-          sid = env['rack.session.options'][:id]
-          Rails.logger.info "Storing sid #{sid} for ticket #{session['cas_last_valid_ticket']}"
-          ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.store_session_id_for_index(session['cas_last_valid_ticket'], sid)
-          session['cas_last_valid_ticket_store'] = false
+        if session.respond_to?(:id)
+          # Rack > 1.5
+          session_id = session.id
+        else
+          # Compatible with old Rack requests
+          session_id = env['rack.session.options'][:id]
         end
-      end
+        cas_ticket_store = session[CAS_TICKET_STORE]
 
+        if cas_ticket_store
+          Rails.logger.info "Storing Session ID #{session_id} for ticket #{session[CAS_LAST_TICKET]}"
+          ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.store_session_id_for_index(session[CAS_LAST_TICKET], session_id)
+          session[CAS_TICKET_STORE] = false
+        end
+      end
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Nat Budin
@@ -10,216 +9,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: devise
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rubycas-client
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.1
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.1
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rails
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rspec-rails
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: mocha
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: shoulda
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: sqlite3-ruby
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: sham_rack
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: capybara
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: crypt-isaac
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: launchy
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: timecop
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: pry
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: CAS authentication module for Devise
 email: natbudin@gmail.com
 executables: []
@@ -300,30 +273,26 @@ files:
 homepage: http://github.com/nbudin/devise_cas_authenticatable
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -1549464804654339845
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CAS authentication module for Devise
 test_files:
 - spec/config_spec.rb