casino_core 1.0.6 → 1.0.7

data/README.md

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

data/Rakefile

@@ -20,7 +20,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "casino_core"
-  gem.homepage = "http://github.com/pencil/CASinoCore"
+  gem.homepage = "http://rbcas.org/"
   gem.license = "MIT"
   gem.summary = "A CAS server core library."
   gem.description = gem.summary

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/casino_core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "casino_core"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nils Caspar"]
-  s.date = "2012-12-31"
+  s.date = "2013-01-01"
   s.description = "A CAS server core library."
   s.email = "ncaspar@me.com"
   s.extra_rdoc_files = [
@@ -117,7 +117,7 @@ Gem::Specification.new do |s|
     "spec/support/factories/service_ticket_factory.rb",
     "spec/support/factories/ticket_granting_ticket_factory.rb"
   ]
-  s.homepage = "http://github.com/pencil/CASinoCore"
+  s.homepage = "http://rbcas.org/"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"

data/lib/casino_core.rb

@@ -19,6 +19,11 @@ module CASinoCore
       config = YAML.load_file('config/cas.yml')[@environment].symbolize_keys
       recursive_symbolize_keys!(config)
       CASinoCore::Settings.init config
+
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.acronym 'CAS'
+        inflect.acronym 'CASino'
+      end
     end
 
     private

data/lib/casino_core/authenticator.rb

@@ -2,6 +2,8 @@ module CASinoCore
   class Authenticator
     autoload :Static, 'casino_core/authenticator/static.rb'
 
+    class AuthenticatorError < StandardError; end
+
     def validate(username, password)
       raise NotImplementedError, "This method must be implemented by a class extending #{self.class}"
     end

data/lib/casino_core/helper/authentication.rb

@@ -5,7 +5,11 @@ module CASinoCore
       def validate_login_credentials(username, password)
         authentication_result = nil
         CASinoCore::Settings.authenticators.each do |authenticator_name, authenticator|
-          data = authenticator.validate(username, password)
+          begin
+            data = authenticator.validate(username, password)
+          rescue CASinoCore::Authenticator::AuthenticatorError => e
+            logger.error "Authenticator '#{authenticator_name}' (#{authenticator.class}) raised an error: #{e}"
+          end
           if data
             authentication_result = { authenticator: authenticator_name, user_data: data }
             logger.info("Credentials for username '#{data[:username]}' successfully validated using authenticator '#{authenticator_name}' (#{authenticator.class})")

data/lib/casino_core/model/proxy_ticket.rb

@@ -22,6 +22,6 @@ class CASinoCore::Model::ProxyTicket < ActiveRecord::Base
     else
       CASinoCore::Settings.proxy_ticket[:lifetime_unconsumed]
     end
-    Time.now - self.created_at > lifetime
+    (Time.now - (self.created_at || Time.now)) > lifetime
   end
 end

data/lib/casino_core/model/service_ticket.rb

@@ -35,7 +35,7 @@ class CASinoCore::Model::ServiceTicket < ActiveRecord::Base
     else
       CASinoCore::Settings.service_ticket[:lifetime_unconsumed]
     end
-    Time.now - self.created_at > lifetime
+    (Time.now - (self.created_at || Time.now)) > lifetime
   end
 
   private

data/lib/casino_core/model/ticket_granting_ticket.rb

@@ -10,8 +10,14 @@ class CASinoCore::Model::TicketGrantingTicket < ActiveRecord::Base
   after_destroy :destroy_proxy_granting_tickets
 
   def browser_info
-    user_agent = UserAgent.parse(self.user_agent)
-    "#{user_agent.browser} (#{user_agent.platform})"
+    unless self.user_agent.blank?
+      user_agent = UserAgent.parse(self.user_agent)
+      if user_agent.platform.nil?
+        "#{user_agent.browser}"
+      else
+        "#{user_agent.browser} (#{user_agent.platform})"
+      end
+    end
   end
 
   def same_user?(other_ticket)

data/spec/model/proxy_ticket_spec.rb

@@ -1,32 +1,63 @@
 require 'spec_helper'
 
 describe CASinoCore::Model::ProxyTicket do
-  let(:ticket) {
-    ticket = described_class.new ticket: 'PT-12345', service: 'any string is valid'
+  let(:unconsumed_ticket) {
+    ticket = described_class.new ticket: 'PT-12345', service: 'any_string_is_valid'
     ticket.proxy_granting_ticket_id = 1
     ticket
   }
+  let(:consumed_ticket) {
+    ticket = described_class.new ticket: 'PT-54321', service: 'any_string_is_valid'
+    ticket.proxy_granting_ticket_id = 1
+    ticket.consumed = true
+    ticket.save!
+    ticket
+  }
+
+  describe '#expired?' do
+    [:unconsumed, :consumed].each do |state|
+      context "with an #{state} ticket" do
+        let(:ticket) { send("#{state}_ticket") }
+
+        context 'with an expired ticket' do
+          before(:each) do
+            ticket.created_at = (CASinoCore::Settings.service_ticket[:"lifetime_#{state}"].seconds + 1).ago
+            ticket.save!
+          end
+
+          it 'returns true' do
+            ticket.expired?.should == true
+          end
+        end
+
+        context 'with an unexpired ticket' do
+          it 'returns false' do
+            ticket.expired?.should == false
+          end
+        end
+      end
+    end
+  end
 
   describe '.cleanup_unconsumed' do
     it 'deletes expired unconsumed service tickets' do
-      ticket.created_at = 10.hours.ago
-      ticket.save!
+      unconsumed_ticket.created_at = 10.hours.ago
+      unconsumed_ticket.save!
       lambda do
         described_class.cleanup_unconsumed
       end.should change(described_class, :count).by(-1)
-      described_class.find_by_ticket('ST-12345').should be_false
+      described_class.find_by_ticket('PT-12345').should be_false
     end
   end
 
   describe '.cleanup_consumed' do
     it 'deletes expired consumed service tickets' do
-      ticket.consumed = true
-      ticket.created_at = 10.days.ago
-      ticket.save!
+      consumed_ticket.created_at = 10.days.ago
+      consumed_ticket.save!
       lambda do
         described_class.cleanup_consumed
       end.should change(described_class, :count).by(-1)
-      described_class.find_by_ticket('ST-12345').should be_false
+      described_class.find_by_ticket('PT-12345').should be_false
     end
   end
 end

data/spec/model/service_ticket_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CASinoCore::Model::ServiceTicket do
-  let(:ticket) {
+  let(:unconsumed_ticket) {
     ticket = described_class.new ticket: 'ST-12345', service: 'https://example.com/cas-service'
     ticket.ticket_granting_ticket_id = 1
     ticket
@@ -14,10 +14,35 @@ describe CASinoCore::Model::ServiceTicket do
     ticket
   }
 
+  describe '#expired?' do
+    [:unconsumed, :consumed].each do |state|
+      context "with an #{state} ticket" do
+        let(:ticket) { send("#{state}_ticket") }
+
+        context 'with an expired ticket' do
+          before(:each) do
+            ticket.created_at = (CASinoCore::Settings.service_ticket[:"lifetime_#{state}"].seconds + 1).ago
+            ticket.save!
+          end
+
+          it 'returns true' do
+            ticket.expired?.should == true
+          end
+        end
+
+        context 'with an unexpired ticket' do
+          it 'returns false' do
+            ticket.expired?.should == false
+          end
+        end
+      end
+    end
+  end
+
   describe '.cleanup_unconsumed' do
     it 'deletes expired unconsumed service tickets' do
-      ticket.created_at = 10.hours.ago
-      ticket.save!
+      unconsumed_ticket.created_at = 10.hours.ago
+      unconsumed_ticket.save!
       lambda do
         described_class.cleanup_unconsumed
       end.should change(described_class, :count).by(-1)
@@ -25,6 +50,20 @@ describe CASinoCore::Model::ServiceTicket do
     end
   end
 
+  describe '.cleanup_consumed_hard' do
+    before(:each) do
+      described_class::SingleSignOutNotifier.any_instance.stub(:notify).and_return(false)
+    end
+
+    it 'deletes consumed service tickets with an unreachable Single Sign Out callback server' do
+      consumed_ticket.created_at = 10.days.ago
+      consumed_ticket.save!
+      lambda do
+        described_class.cleanup_consumed_hard
+      end.should change(described_class, :count).by(-1)
+    end
+  end
+
   describe '.cleanup_consumed' do
     before(:each) do
       described_class::SingleSignOutNotifier.any_instance.stub(:notify).and_return(true)

data/spec/model/ticket_granting_ticket_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
+require 'useragent'
 
 describe CASinoCore::Model::TicketGrantingTicket do
-  let(:ticket_granting_ticket) { described_class.create! ticket: 'TGT-3ep9awhy2ty5UhL8wM1xAZ', username: 'example-user', authenticator: 'test' }
+  let(:ticket_granting_ticket) { FactoryGirl.create :ticket_granting_ticket }
   let(:service_ticket) { FactoryGirl.create :service_ticket, ticket_granting_ticket: ticket_granting_ticket }
   let(:consumed_service_ticket) { FactoryGirl.create :service_ticket, :consumed, ticket_granting_ticket: ticket_granting_ticket }
 
@@ -25,4 +26,66 @@ describe CASinoCore::Model::TicketGrantingTicket do
       end
     end
   end
+
+  describe '#browser_info' do
+    let(:user_agent) { Object.new }
+    before(:each) do
+      user_agent.stub(:browser).and_return('TestBrowser')
+      UserAgent.stub(:parse).and_return(user_agent)
+    end
+
+    context 'without platform' do
+      before(:each) do
+        user_agent.stub(:platform).and_return(nil)
+      end
+
+      it 'returns the browser name' do
+        ticket_granting_ticket.browser_info.should == 'TestBrowser'
+      end
+    end
+
+    context 'with a platform' do
+      before(:each) do
+        user_agent.stub(:platform).and_return('Linux')
+      end
+
+      it 'returns the browser name' do
+        ticket_granting_ticket.browser_info.should == 'TestBrowser (Linux)'
+      end
+    end
+  end
+
+  describe '#same_user?' do
+    context 'with a nil value' do
+      let(:other_ticket_granting_ticket) { nil }
+
+      it 'should return false' do
+        ticket_granting_ticket.same_user?(other_ticket_granting_ticket).should == false
+      end
+    end
+
+    context 'with a ticket from another user' do
+      let(:other_ticket_granting_ticket) { FactoryGirl.create :ticket_granting_ticket, username: 'bla'  }
+
+      it 'should return false' do
+        ticket_granting_ticket.same_user?(other_ticket_granting_ticket).should == false
+      end
+    end
+
+    context 'with a ticket from another authenticator' do
+      let(:other_ticket_granting_ticket) { FactoryGirl.create :ticket_granting_ticket, authenticator: 'bla'  }
+
+      it 'should return false' do
+        ticket_granting_ticket.same_user?(other_ticket_granting_ticket).should == false
+      end
+    end
+
+    context 'with a ticket from the same user and authenticator' do
+      let(:other_ticket_granting_ticket) { FactoryGirl.create :ticket_granting_ticket }
+
+      it 'should return true' do
+        ticket_granting_ticket.same_user?(other_ticket_granting_ticket).should == true
+      end
+    end
+  end
 end

data/spec/processor/login_credential_acceptor_spec.rb

@@ -32,18 +32,32 @@ describe CASinoCore::Processor::LoginCredentialAcceptor do
       end
 
       context 'with valid credentials' do
+        let(:service) { 'https://www.example.org' }
         let(:login_data) { { lt: login_ticket.ticket, username: 'testuser', password: 'foobar123', service: service } }
 
         before(:each) do
           listener.stub(:user_logged_in)
         end
 
+        context 'when all authenticators raise an error' do
+          before(:each) do
+            CASinoCore::Authenticator::Static.any_instance.stub(:validate) do
+              raise CASinoCore::Authenticator::AuthenticatorError, 'error123'
+            end
+          end
+
+          it 'calls the #invalid_login_credentials method on the listener' do
+            listener.should_receive(:invalid_login_credentials).with(kind_of(CASinoCore::Model::LoginTicket))
+            processor.process(login_data)
+          end
+        end
+
         context 'without a service' do
           let(:service) { nil }
 
           it 'calls the #user_logged_in method on the listener' do
             listener.should_receive(:user_logged_in).with(nil, /^TGC\-/)
-            processor.process(lt: login_ticket.ticket, username: 'testuser', password: 'foobar123')
+            processor.process(login_data)
           end
 
           it 'generates a ticket-granting ticket' do

data/spec/spec_helper.rb

@@ -1,8 +1,20 @@
+require 'active_support/core_ext'
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter '/spec'
+  base_path = "#{File.dirname(__FILE__)}/../"
+  Dir["#{base_path}lib/casino_core/*.rb"].each do |f|
+    f.gsub!(/\A#{base_path}(.+)\.rb\z/, '\1')
+    name = File.basename(f).humanize.pluralize
+    add_group name, f
+  end
+end
+
 require 'database_cleaner'
 require 'logger'
 require 'webmock/rspec'
 require 'casino_core'
-require 'simplecov'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -24,16 +36,6 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  SimpleCov.start do
-    add_filter '/spec'
-    base_path = "#{File.dirname(__FILE__)}/../"
-    Dir["#{base_path}lib/casino_core/*.rb"].each do |f|
-      f.gsub!(/\A#{base_path}(.+)\.rb\z/, '\1')
-      name = File.basename(f).humanize.pluralize
-      add_group name, f
-    end
-  end
-
   CASinoCore.setup 'test'
   CASinoCore::Settings.logger.level = ::Logger::Severity::UNKNOWN
 

metadata

@@ -2,7 +2,7 @@
 name: casino_core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Nils Caspar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-31 00:00:00 Z
+date: 2013-01-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -275,7 +275,7 @@ files:
 - spec/support/factories/proxy_ticket_factory.rb
 - spec/support/factories/service_ticket_factory.rb
 - spec/support/factories/ticket_granting_ticket_factory.rb
-homepage: http://github.com/pencil/CASinoCore
+homepage: http://rbcas.org/
 licenses: 
 - MIT
 post_install_message: 
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3280265477686707578
+      hash: 903042986350696611
       segments: 
       - 0
       version: "0"