casino 1.2.2 → 1.3.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    casino (1.2.2)
-      casino_core (~> 1.3.2)
+    casino (1.3.0)
+      casino_core (~> 1.4.0)
       http_accept_language (~> 2.0.0.pre)
       jquery-rails (~> 2.1)
       rails (~> 3.2.9)
@@ -10,12 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -23,24 +23,24 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.3)
     arel (3.0.2)
     builder (3.0.4)
-    casino_core (1.3.5)
+    casino_core (1.4.0)
       activerecord (~> 3.2.9)
       addressable (~> 2.3)
       faraday (~> 0.8)
@@ -49,22 +49,22 @@ GEM
       useragent (~> 0.4)
     diff-lcs (1.2.1)
     erubis (2.7.0)
-    faraday (0.8.6)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     hike (1.2.1)
     http_accept_language (2.0.0.pre)
-    i18n (0.6.4)
+    i18n (0.6.1)
     journey (1.0.4)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.21)
-    multi_json (1.7.1)
+    multi_json (1.7.2)
     multipart-post (1.2.0)
     polyglot (0.3.3)
     rack (1.4.5)
@@ -74,17 +74,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -97,7 +97,7 @@ GEM
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
+    rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
@@ -120,12 +120,12 @@ GEM
     sqlite3 (1.3.7)
     terminal-table (1.4.5)
     thor (0.17.0)
-    tilt (1.3.4)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    useragent (0.4.16)
+    useragent (0.5.0)
 
 PLATFORMS
   ruby

data/app/assets/stylesheets/casino.scss

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,600);
+@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,600);
 @import "casino/normalize";
 
 /// DEFAULT SETTINGS ///
@@ -208,7 +208,7 @@ table {
 /// LOGIN ///
 .login {
   > div {
-    height: 241px;
+    height: 275px;
   }
 
   .logo {

data/app/views/casino/sessions/new.html.erb

@@ -13,6 +13,9 @@
         <%= text_field_tag :username, params[:username] %>
         <%= label_tag :password, t('login.label_password') %>
         <%= password_field_tag :password %>
+        <%= label_tag :rememberMe do %>
+          <%= check_box_tag :rememberMe, 1, params[:rememberMe] %> <%= t('login.label_remember_me') %>
+        <% end %>
         <%= button_tag t('login.label_button'), :class => 'button' %>
       <% end %>
     </div>

data/casino.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rails', '~> 3.2.9'
   s.add_runtime_dependency 'jquery-rails', '~> 2.1'
   s.add_runtime_dependency 'http_accept_language', '~> 2.0.0.pre'
-  s.add_runtime_dependency 'casino_core', '~> 1.3.2'
+  s.add_runtime_dependency 'casino_core', '~> 1.4.0'
 end

data/config/locales/de.yml

@@ -6,6 +6,7 @@ de:
     label_username: "Benutzername"
     label_password: "Passwort"
     label_button: "Login"
+    label_remember_me: "Eingeloggt bleiben"
   service_not_allowed:
     title: "Service nicht erlaubt"
     message: "Dieser SSO-Server ist nicht konfiguriert, um Logins für \"%{service}\" zu erlauben. Wenn Sie denken, es handle sich hierbei um einen Fehler, kontaktieren Sie bitte Ihren Administrator."
@@ -14,7 +15,7 @@ de:
     description: "Bitte geben Sie ein gültiges Einmalkennwort an."
     code: "Code"
     submit: "Fortfahren"
-    invalid_otp: "Das eingegebene Einmalkennwort ist ungültigt."
+    invalid_otp: "Das eingegebene Einmalkennwort ist ungültig."
   logout:
     title: "Auf Wiedersehen."
     logged_out_without_url: "Sie haben sich erfolgreich ausgeloggt."

data/config/locales/en.yml

@@ -6,6 +6,7 @@ en:
     label_username: "Username"
     label_password: "Password"
     label_button: "Login"
+    label_remember_me: "Stay logged in"
   service_not_allowed:
     title: "Service not allowed"
     message: "This SSO server is not configured to allow logins to \"%{service}\". If you think this is an error, please contact your administrator."

data/lib/casino/listener/login_credential_acceptor.rb

@@ -1,8 +1,8 @@
 require 'casino/listener'
 
 class CASino::Listener::LoginCredentialAcceptor < CASino::Listener
-  def user_logged_in(url, ticket_granting_ticket)
-    @controller.cookies[:tgt] = ticket_granting_ticket
+  def user_logged_in(url, ticket_granting_ticket, cookie_expiry_time = nil)
+    @controller.cookies[:tgt] = { value: ticket_granting_ticket, expires: cookie_expiry_time }
     if url.nil?
       @controller.redirect_to sessions_path, status: :see_other
     else

data/lib/casino/listener/logout.rb

@@ -1,8 +1,12 @@
 require 'casino/listener'
 
 class CASino::Listener::Logout < CASino::Listener
-  def user_logged_out(url)
-    assign(:url, url)
+  def user_logged_out(url, redirect_immediately = false)
+    if redirect_immediately
+      @controller.redirect_to url, status: :see_other
+    else
+      assign(:url, url)
+    end
     @controller.cookies.delete :tgt
   end
 end

data/lib/casino/version.rb

@@ -1,3 +1,3 @@
 module CASino
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/spec/controllers/listener/login_credential_acceptor_spec.rb

@@ -28,7 +28,17 @@ describe CASino::Listener::LoginCredentialAcceptor do
 
       it 'creates the tgt cookie' do
         listener.user_logged_in(url, ticket_granting_ticket)
-        controller.cookies[:tgt].should == ticket_granting_ticket
+        controller.cookies[:tgt][:value].should == ticket_granting_ticket
+      end
+    end
+
+    context 'with cookie expiry time' do
+      let(:url) { Object.new }
+      let(:expiry_time) { Time.now }
+      it 'set the tgt cookie expiry time' do
+        listener.user_logged_in(url, ticket_granting_ticket, expiry_time)
+        controller.cookies[:tgt][:value].should == ticket_granting_ticket
+        controller.cookies[:tgt][:expires].should == expiry_time
       end
     end
   end

data/spec/controllers/listener/logout_spec.rb

@@ -17,5 +17,22 @@ describe CASino::Listener::Logout do
       listener.user_logged_out(url)
       controller.cookies[:tgt].should be_nil
     end
+
+    context 'with redirect_immediately flag' do
+      before(:each) do
+        controller.stub(:redirect_to)
+      end
+
+      it 'tells the controller to redirect the client' do
+        controller.should_receive(:redirect_to).with(url, status: :see_other)
+        listener.user_logged_out(url, true)
+      end
+
+      it 'deletes an existing ticket-granting ticket cookie' do
+        controller.cookies = { tgt: 'TGT-12345' }
+        listener.user_logged_out(url, true)
+        controller.cookies[:tgt].should be_nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casino
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   b1VSdnUwRzgvWXlIVUFtSVUvV0tyanIxYmdjZjFWUnYKUjRLRDFNblVWL3Y1
   MDJwaU1sWG1qeE9XZGJLOHl2UUVIa3N1L3pqYkNqU3UrTTJrd0ZtV0dzeDVu
   eCtWZHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,7 +175,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 description: CASino is a simple CAS (Central Authentication Service) server using
   CASinoCore as its backend.
 email:
@@ -267,9 +267,6 @@ files:
 - lib/generators/casino/templates/casino_and_overrides.scss
 - lib/generators/casino/templates/casino_core.rb
 - lib/generators/casino/templates/database.yml
-- lib/tasks/.gitkeep
-- lib/tasks/login_tickets.rake
-- lib/tasks/service_tickets.rake
 - public/404.html
 - public/422.html
 - public/500.html
@@ -347,15 +344,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2368767182679843920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2368767182679843920
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple CAS server written in Ruby using the Rails framework.

metadata.gz.sig

@@ -1,3 +1,2 @@
-�ߐ9����<j�p
-�G�P�����5R>��
-�Kst���S���A\�8aH���0����WP�F�MK�_�5�Kv�%�ߛy8��K�D ��c�}
+��1�z3�Y�;9D�1#�2ڀ�ԇ$�lLٲ|5�	������DAM�~�U����B/I�n��-=�Sd'�m��n\����Xw�ssʩ�9�Ԯ1�#*�Y�S�4��/��@+��	c$�Aˊ�'�)��.n��;�����+̾S.@���M
+MR�=�i_/H��s�|qڄ ʜb?n�30�w;�H1��9�<�����(��@I�f�x�C�=��^	I�沏�㐡Ǖ���K�Y
Y���"�yড�Y

data/lib/tasks/login_tickets.rake

@@ -1,7 +0,0 @@
-namespace :login_tickets do
-  desc 'Remove expired login tickets.'
-  task cleanup: :environment do
-    rows_affected = LoginTicket.cleanup
-    puts "Deleted #{rows_affected} login tickets."
-  end
-end

data/lib/tasks/service_tickets.rake

@@ -1,9 +0,0 @@
-namespace :service_tickets do
-  desc 'Remove expired service tickets.'
-  task cleanup: :environment do
-    [:consumed, :unconsumed].each do |type|
-      rows_affected = ServiceTicket.send("cleanup_#{type}")
-      puts "Deleted #{rows_affected} #{type} service tickets."
-    end
-  end
-end