casino_core 1.4.0 → 1.4.1

data/README.md

@@ -1,4 +1,4 @@
-# CASinoCore [![Build Status](https://secure.travis-ci.org/rbCAS/CASinoCore.png?branch=master)](https://travis-ci.org/rbCAS/CASinoCore)
+# CASinoCore [![Build Status](https://secure.travis-ci.org/rbCAS/CASinoCore.png?branch=master)](https://travis-ci.org/rbCAS/CASinoCore) [![Coverage Status](https://coveralls.io/repos/rbCAS/CASinoCore/badge.png?branch=master)](https://coveralls.io/r/rbCAS/CASinoCore)
 
 A CAS server core library.
 

data/lib/casino_core/helper/ticket_granting_tickets.rb

@@ -58,9 +58,7 @@ module CASinoCore
       end
 
       def cleanup_expired_ticket_granting_tickets(user)
-        user.ticket_granting_tickets.where(['created_at < ?', CASinoCore::Settings.ticket_granting_ticket[:lifetime].seconds.ago]).destroy_all.tap do |destroyed|
-          logger.info "Destroyed #{destroyed.length} expired ticket-granting tickets"
-        end
+        CASinoCore::Model::TicketGrantingTicket.cleanup(user)
       end
 
     end

data/lib/casino_core/model/ticket_granting_ticket.rb

@@ -7,13 +7,18 @@ class CASinoCore::Model::TicketGrantingTicket < ActiveRecord::Base
   belongs_to :user
   has_many :service_tickets, dependent: :destroy
 
-  def self.cleanup
-    self.destroy_all([
+  def self.cleanup(user = nil)
+    if user.nil?
+      base = self
+    else
+      base = user.ticket_granting_tickets
+    end
+    base.where([
       '(created_at < ? AND long_term = ?) OR created_at < ?',
       CASinoCore::Settings.ticket_granting_ticket[:lifetime].seconds.ago,
       false,
       CASinoCore::Settings.ticket_granting_ticket[:lifetime_long_term].seconds.ago
-    ])
+    ]).destroy_all
   end
 
   def browser_info
@@ -36,7 +41,9 @@ class CASinoCore::Model::TicketGrantingTicket < ActiveRecord::Base
   end
 
   def expired?
-    if long_term?
+    if awaiting_two_factor_authentication?
+      lifetime = CASinoCore::Settings.two_factor_authenticator[:timeout]
+    elsif long_term?
       lifetime = CASinoCore::Settings.ticket_granting_ticket[:lifetime_long_term]
     else
       lifetime = CASinoCore::Settings.ticket_granting_ticket[:lifetime]

data/lib/casino_core/settings.rb

@@ -24,6 +24,7 @@ module CASinoCore
           lifetime_consumed: 86400
         },
         two_factor_authenticator: {
+          timeout: 180,
           lifetime_inactive: 300,
           drift: 30
         }

data/lib/casino_core/version.rb

@@ -1,3 +1,3 @@
 module CASinoCore
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/model/ticket_granting_ticket_spec.rb

@@ -125,6 +125,30 @@ describe CASinoCore::Model::TicketGrantingTicket do
         ticket_granting_ticket.expired?.should == false
       end
     end
+
+    context 'with pending two-factor authentication' do
+      before(:each) do
+        ticket_granting_ticket.awaiting_two_factor_authentication = true
+        ticket_granting_ticket.save!
+      end
+
+      context 'with an expired ticket' do
+        before(:each) do
+          ticket_granting_ticket.created_at = 10.minutes.ago
+          ticket_granting_ticket.save!
+        end
+
+        it 'returns true' do
+          ticket_granting_ticket.expired?.should == true
+        end
+      end
+
+      context 'with an unexpired ticket' do
+        it 'returns false' do
+          ticket_granting_ticket.expired?.should == false
+        end
+      end
+    end
   end
 
   describe '.cleanup' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casino_core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   b1VSdnUwRzgvWXlIVUFtSVUvV0tyanIxYmdjZjFWUnYKUjRLRDFNblVWL3Y1
   MDJwaU1sWG1qeE9XZGJLOHl2UUVIa3N1L3pqYkNqU3UrTTJrd0ZtV0dzeDVu
   eCtWZHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -313,7 +313,6 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
-- VERSION
 - casino-public_cert.pem
 - casino_core.gemspec
 - config/cas.yml
@@ -448,21 +447,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3391276428784871857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3391276428784871857
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A CAS server core library.

data/VERSION

@@ -1 +0,0 @@
-1.0.9