gunark-rubycas-server 0.8.0.20090506 → 0.8.0.20090715

data/Manifest.txt

@@ -42,6 +42,7 @@ locale/es_ES/LC_MESSAGES/rubycas-server.mo
 locale/fr_FR/LC_MESSAGES/rubycas-server.mo
 locale/ja_JP/LC_MESSAGES/rubycas-server.mo
 locale/pl_PL/LC_MESSAGES/rubycas-server.mo
+locale/pt_BR/LC_MESSAGES/rubycas-server.mo
 locale/ru_RU/LC_MESSAGES/rubycas-server.mo
 po/de_DE/rubycas-server.po
 po/es_ES/rubycas-server.po
@@ -51,11 +52,11 @@ po/pl_PL/rubycas-server.po
 po/pt_BR/rubycas-server.po
 po/ru_RU/rubycas-server.po
 po/rubycas-server.pot
-public/test
 public/themes/cas.css
 public/themes/notice.png
 public/themes/ok.png
 public/themes/simple/bg.png
+public/themes/simple/favicon.png
 public/themes/simple/login_box_bg.png
 public/themes/simple/logo.png
 public/themes/simple/theme.css

data/config/hoe.rb

@@ -10,6 +10,7 @@ DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
   'activesupport',
   'activerecord',
+  'locale',
   'gettext',
   ['picnic', '>= 0.8.1']
 ]    # An array of rubygem dependencies [name, version]

data/config.example.yml

@@ -66,7 +66,7 @@ ssl_cert: /path/to/your/ssl.pem
 #     binaries will be downloaded and installed, so don't worry about this).
 
 #server: mongrel
-#port: 110011
+#port: 11011
 
 
 # Bind the server to a specific address. Use 0.0.0.0 to listen on all
@@ -518,24 +518,21 @@ log:
 
 # You can set various ticket expiry times (specify the value in seconds).
 
-# Expired login and service tickets are no longer usable this many seconds after 
+# Unused login and service tickets become unusable this many seconds after
 # they are created. (Defaults to 5 minutes)
 
-#login_ticket_expiry: 300
-#service_ticket_expiry: 300
+#maximum_unused_login_ticket_lifetime: 300
+#maximum_unused_service_ticket_lifetime: 300
 
-# Proxy- and ticket-granting tickets do not expire -- normally they are made 
-# invalid only when the user logs out. But the server must periodically delete 
-# them to prevent buildup of stale data. PGTs and TGTs will be deleted during 
-# server startup if they are this many seconds old. (Defaults to 48 hours)
-
-#proxy_granting_ticket_expiry: 172800
-#ticket_granting_ticket_expiry: 172800
-
-# If you would prefer that ticket-granting ticket expiry be enforced (in effect 
-# limiting the maximum length of a session), you can set expire_sessions to true.
+# The server must periodically delete old tickets (login tickets, service tickets
+# proxy-granting tickets, and ticket-granting tickets) to prevent buildup of
+# stale data. This effectively limits the maximum length of a CAS session to
+# the lifetime given here (in seconds). (Defaults to 48 hours)
+# 
+# Note that this limit is not enforced on the client side; it refers only to the
+# the maximum lifetime of tickets on the CAS server.
 
-#expire_sessions: false
+#maximum_session_lifetime: 172800
 
 
 # If you want the usernames entered on the login page to be automatically 

data/config.ru

@@ -1,3 +1,12 @@
+# This is the Rackup initialization script for running RubyCAS-Server under Passenger/Rack.
+#
+# This file doesn't really have anything to do with your server's "configuration",
+# and you almost certainly don't need to modify it. Instead, a config file should
+# have been created for you (probably under /etc/rubycas-server/config.yml) -- this
+# is the file you'll want to modify. If for some reason the configuration file
+# was not created for you, have a look at the config.example.yml template and
+# go from there.
+
 require 'rubygems'
 require 'rack'
 

data/lib/casserver/authenticators/sql_encrypted.rb

@@ -32,13 +32,14 @@ class CASServer::Authenticators::SQLEncrypted < CASServer::Authenticators::Base
     CASUser.set_table_name @options[:user_table] || "users"
     
     username_column = @options[:username_column] || "username"
+    encrypt_function = @options[:encrypt_function] || 'user.encrypted_password == Digest::SHA256.hexdigest("#{user.encryption_salt}::#{@password}")'
     
     results = CASUser.find(:all, :conditions => ["#{username_column} = ?", @username])
     
     if results.size > 0
       $LOG.warn("Multiple matches found for user '#{@username}'") if results.size > 1
       user = results.first
-      return user.encrypted_password == user.encrypt(@password)
+      return eval(encrypt_function)
     else
       return false
     end
@@ -73,4 +74,4 @@ class CASServer::Authenticators::SQLEncrypted < CASServer::Authenticators::Base
   class CASUser < ActiveRecord::Base
     include EncryptedPassword
   end
-end
+end

data/lib/casserver/authenticators/test.rb

@@ -1,7 +1,7 @@
 require 'casserver/authenticators/base'
 
 # Dummy authenticator used for testing. 
-# Accepts "testuser" for username and "testpassword" for password; otherwise authentication fails.
+# Accepts any username as valid as long as the password is "testpassword"; otherwise authentication fails.
 # Raises an AuthenticationError when username is "do_error" (this is useful to test the Exception
 # handling functionality).
 class CASServer::Authenticators::Test < CASServer::Authenticators::Base

data/lib/casserver/cas.rb

@@ -45,7 +45,7 @@ module CASServer::CAS
     st.ticket = "ST-" + CASServer::Utils.random_string
     st.service = service
     st.username = username
-    st.ticket_granting_ticket = tgt
+    st.granted_by_tgt_id = tgt.id
     st.client_hostname = @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']
     st.save!
     $LOG.debug("Generated service ticket '#{st.ticket}' for service '#{st.service}'" +
@@ -59,8 +59,8 @@ module CASServer::CAS
     pt.ticket = "PT-" + CASServer::Utils.random_string
     pt.service = target_service
     pt.username = pgt.service_ticket.username
-    pt.proxy_granting_ticket_id = pgt.id
-    pt.ticket_granting_ticket = pgt.service_ticket.ticket_granting_ticket
+    pt.granted_by_pgt_id = pgt.id
+    pt.granted_by_tgt_id = pgt.service_ticket.granted_by_tgt.id
     pt.client_hostname = @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']
     pt.save!
     $LOG.debug("Generated proxy ticket '#{pt.ticket}' for target service '#{pt.service}'" +
@@ -114,21 +114,21 @@ module CASServer::CAS
   
     success = false
     if ticket.nil?
-      error = "Your login request did not include a login ticket. There may be a problem with the authentication system."
-      $LOG.warn("Missing login ticket.")
+      error = _("Your login request did not include a login ticket. There may be a problem with the authentication system.")
+      $LOG.warn "Missing login ticket."
     elsif lt = LoginTicket.find_by_ticket(ticket)
       if lt.consumed?
-        error = "The login ticket you provided has already been used up. Please try logging in again."
-        $LOG.warn("Login ticket '#{ticket}' previously used up")
-      elsif Time.now - lt.created_on < $CONF.login_ticket_expiry
-        $LOG.info("Login ticket '#{ticket}' successfully validated")
+        error = _("The login ticket you provided has already been used up. Please try logging in again.")
+        $LOG.warn "Login ticket '#{ticket}' previously used up"
+      elsif Time.now - lt.created_on < $CONF.maximum_unused_login_ticket_lifetime
+        $LOG.info "Login ticket '#{ticket}' successfully validated"
       else
-        error = "Your login ticket has expired. Please try logging in again."
-        $LOG.warn("Expired login ticket '#{ticket}'")
+        error = _("You took too long to enter your credentials. Please try again.")
+        $LOG.warn "Expired login ticket '#{ticket}'"
       end
     else
-      error = "The login ticket you provided is invalid. Please try logging in again."
-      $LOG.warn("Invalid login ticket '#{ticket}'")
+      error = _("The login ticket you provided is invalid. There may be a problem with the authentication system.")
+      $LOG.warn "Invalid login ticket '#{ticket}'"
     end
     
     lt.consume! if lt
@@ -141,13 +141,13 @@ module CASServer::CAS
   
     if ticket.nil?
       error = "No ticket granting ticket given."
-      $LOG.debug(error)
+      $LOG.debug error
     elsif tgt = TicketGrantingTicket.find_by_ticket(ticket)
       if $CONF.expire_sessions && Time.now - tgt.created_on > $CONF.ticket_granting_ticket_expiry
         error = "Your session has expired. Please log in again."
-        $LOG.info("Ticket granting ticket '#{ticket}' for user '#{tgt.username}' expired.")
+        $LOG.info "Ticket granting ticket '#{ticket}' for user '#{tgt.username}' expired."
       else
-        $LOG.info("Ticket granting ticket '#{ticket}' for user '#{tgt.username}' successfully validated.")
+        $LOG.info "Ticket granting ticket '#{ticket}' for user '#{tgt.username}' successfully validated."
       end
     else
       error = "Invalid ticket granting ticket '#{ticket}' (no matching ticket found in the database)."
@@ -158,25 +158,25 @@ module CASServer::CAS
   end
 
   def validate_service_ticket(service, ticket, allow_proxy_tickets = false)
-    $LOG.debug("Validating service/proxy ticket '#{ticket}' for service '#{service}'")
+    $LOG.debug "Validating service/proxy ticket '#{ticket}' for service '#{service}'"
   
     if service.nil? or ticket.nil?
       error = Error.new(:INVALID_REQUEST, "Ticket or service parameter was missing in the request.")
-      $LOG.warn("#{error.code} - #{error.message}")
+      $LOG.warn "#{error.code} - #{error.message}"
     elsif st = ServiceTicket.find_by_ticket(ticket)
       if st.consumed?
         error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' has already been used up.")
-        $LOG.warn("#{error.code} - #{error.message}")
+        $LOG.warn "#{error.code} - #{error.message}"
       elsif st.kind_of?(CASServer::Models::ProxyTicket) && !allow_proxy_tickets
         error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' is a proxy ticket, but only service tickets are allowed here.")
-        $LOG.warn("#{error.code} - #{error.message}")
-      elsif Time.now - st.created_on > $CONF.service_ticket_expiry
+        $LOG.warn "#{error.code} - #{error.message}"
+      elsif Time.now - st.created_on > $CONF.maximum_unused_service_ticket_lifetime
         error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' has expired.")
-        $LOG.warn("Ticket '#{ticket}' has expired.")
+        $LOG.warn "Ticket '#{ticket}' has expired."
       elsif !st.matches_service? service
         error = Error.new(:INVALID_SERVICE, "The ticket '#{ticket}' belonging to user '#{st.username}' is valid,"+
           " but the requested service '#{service}' does not match the service '#{st.service}' associated with this ticket.")
-        $LOG.warn("#{error.code} - #{error.message}")
+        $LOG.warn "#{error.code} - #{error.message}"
       else
         $LOG.info("Ticket '#{ticket}' for service '#{service}' for user '#{st.username}' successfully validated.")
       end
@@ -197,10 +197,10 @@ module CASServer::CAS
     pt, error = validate_service_ticket(service, ticket, true)
     
     if pt.kind_of?(CASServer::Models::ProxyTicket) && !error
-      if not pt.proxy_granting_ticket
+      if not pt.granted_by_pgt
         error = Error.new(:INTERNAL_ERROR, "Proxy ticket '#{pt}' belonging to user '#{pt.username}' is not associated with a proxy granting ticket.")
-      elsif not pt.proxy_granting_ticket.service_ticket
-        error = Error.new(:INTERNAL_ERROR, "Proxy granting ticket '#{pt.proxy_granting_ticket}'"+
+      elsif not pt.granted_by_pgt.service_ticket
+        error = Error.new(:INTERNAL_ERROR, "Proxy granting ticket '#{pt.granted_by_pgt}'"+
           " (associated with proxy ticket '#{pt}' and belonging to user '#{pt.username}' is not associated with a service ticket.")
       end
     end
@@ -305,10 +305,11 @@ module CASServer::CAS
     return dirty_service if dirty_service.blank?
     clean_service = dirty_service.dup
     ['service', 'ticket', 'gateway', 'renew'].each do |p|
-      clean_service.sub!(Regexp.new("#{p}=[^&]*"), '')
+      clean_service.sub!(Regexp.new("&?#{p}=[^&]*"), '')
     end
     
-    clean_service.gsub!(/[\/\?]$/, '')
+    clean_service.gsub!(/[\/\?&]$/, '') # remove trailing ?, /, or &
+    clean_service.gsub!('?&', '?')
     clean_service.gsub!(' ', '+')
     
     $LOG.debug("Cleaned dirty service URL #{dirty_service.inspect} to #{clean_service.inspect}") if

data/lib/casserver/conf.rb

@@ -1,10 +1,8 @@
 
 conf_defaults = {
-  :expire_sessions => false,
-  :login_ticket_expiry => 5.minutes,
-  :service_ticket_expiry => 5.minutes, # CAS Protocol Spec, sec. 3.2.1 (recommended expiry time)
-  :proxy_granting_ticket_expiry => 48.hours,
-  :ticket_granting_ticket_expiry => 48.hours,
+  :maximum_unused_login_ticket_lifetime => 5.minutes,
+  :maximum_unused_service_ticket_lifetime => 5.minutes, # CAS Protocol Spec, sec. 3.2.1 (recommended expiry time)
+  :maximum_session_lifetime => 1.month, # all tickets are deleted after this period of time
   :log => {:file => 'casserver.log', :level => 'DEBUG'},
   :uri_path => "/"
 }
@@ -70,7 +68,6 @@ rescue NameError
   end
 end
 
-
 $CONF[:static] = {
   :urls => "/themes",
   :root  => "#{$APP_ROOT}/public"

data/lib/casserver/controllers.rb

@@ -161,23 +161,23 @@ module CASServer::Controllers
         # 3.6 (ticket-granting cookie)
         tgt = generate_ticket_granting_ticket(@username, extra_attributes)
         
-        if $CONF.expire_sessions
-          expires = $CONF.ticket_granting_ticket_expiry.to_i.from_now
+        if $CONF.maximum_session_lifetime
+          expires = $CONF.maximum_session_lifetime.to_i.from_now
           expiry_info = " It will expire on #{expires}."
         else
           expiry_info = " It will not expire."
         end
         
-        if $CONF.expire_sessions
+        if $CONF.maximum_session_lifetime
           cookies['tgt'] = {
             :value => tgt.to_s, 
-            :expires => Time.now + $CONF.ticket_granting_ticket_expiry
+            :expires => Time.now + $CONF.maximum_session_lifetime
           }
         else
           cookies['tgt'] = tgt.to_s
         end
         
-        $LOG.debug("Ticket granting cookie '#{cookies['tgt'].inspect}' granted to '#{@username.inspect}'. #{expiry_info}")
+        $LOG.debug("Ticket granting cookie '#{cookies['tgt'].inspect}' granted to #{@username.inspect}. #{expiry_info}")
                 
         if @service.blank?
           $LOG.info("Successfully authenticated user '#{@username}' at '#{tgt.client_hostname}'. No service param was given, so we will not redirect.")
@@ -228,25 +228,23 @@ module CASServer::Controllers
       
       if tgt
         CASServer::Models::TicketGrantingTicket.transaction do
-          pgts = CASServer::Models::ProxyGrantingTicket.find(:all, 
+          $LOG.debug("Deleting Service/Proxy Tickets for '#{tgt}' for user '#{tgt.username}'")
+          tgt.granted_service_tickets.each do |st|
+            send_logout_notification_for_service_ticket(st) if $CONF.enable_single_sign_out
+            # TODO: Maybe we should do some special handling if send_logout_notification_for_service_ticket fails?
+            #       (the above method returns false if the POST results in a non-200 HTTP response).
+            $LOG.debug "Deleting #{st.class.name.demodulize} #{st.ticket.inspect} for service #{st.service}."
+            st.destroy
+          end
+
+          pgts = CASServer::Models::ProxyGrantingTicket.find(:all,
             :conditions => [CASServer::Models::Base.connection.quote_table_name(CASServer::Models::ServiceTicket.table_name)+".username = ?", tgt.username],
-            :include => :service_ticket) 
+            :include => :service_ticket)
           pgts.each do |pgt|
             $LOG.debug("Deleting Proxy-Granting Ticket '#{pgt}' for user '#{pgt.service_ticket.username}'")
             pgt.destroy
           end
           
-          if $CONF.enable_single_sign_out
-            $LOG.debug("Deleting Service/Proxy Tickets for '#{tgt}' for user '#{tgt.username}'")
-            tgt.service_tickets.each do |st|
-              send_logout_notification_for_service_ticket(st)
-              # TODO: Maybe we should do some special handling if send_logout_notification_for_service_ticket fails? 
-              #       (the above method returns false if the POST results in a non-200 HTTP response).
-              $LOG.debug "Deleting #{st.class.name.demodulize} #{st.ticket.inspect}."
-              st.destroy
-            end
-          end
-          
           $LOG.debug("Deleting #{tgt.class.name.demodulize} '#{tgt}' for user '#{tgt.username}'")
           tgt.destroy
         end  
@@ -258,8 +256,7 @@ module CASServer::Controllers
       
       @message = {:type => 'confirmation', :message => _("You have successfully logged out.")}
       
-      @message[:message] << 
-        _(" Please click on the following link to continue:") if @continue_url
+      @message[:message] +=_(" Please click on the following link to continue:") if @continue_url
       
       @lt = generate_login_ticket
       
@@ -322,7 +319,7 @@ module CASServer::Controllers
           pgt = generate_proxy_granting_ticket(@pgt_url, st)
           @pgtiou = pgt.iou if pgt
         end
-        @extra_attributes = st.ticket_granting_ticket.extra_attributes || {}
+        @extra_attributes = st.granted_by_tgt.extra_attributes || {}
       end
       
       @status = CASServer::Controllers.response_status_from_error(@error) if @error
@@ -356,7 +353,7 @@ module CASServer::Controllers
         @username = t.username
         
         if t.kind_of? CASServer::Models::ProxyTicket
-          @proxies << t.proxy_granting_ticket.service_ticket.service
+          @proxies << t.granted_by_pgt.service_ticket.service
         end
           
         if @pgt_url
@@ -364,7 +361,7 @@ module CASServer::Controllers
           @pgtiou = pgt.iou if pgt
         end
         
-        @extra_attributes = t.ticket_granting_ticket.extra_attributes || {}
+        @extra_attributes = t.granted_by_tgt.extra_attributes || {}
       end
       
       @status = CASServer::Controllers.response_status_from_error(@error) if @error

data/lib/casserver/localization.rb

@@ -12,14 +12,32 @@ module CASServer
   end
   
   def determine_locale
-    lang = ($CONF[:default_locale] || "en")
-    lang = @input['lang'] unless @input['lang'].blank? 
-    lang ||= @cookies['lang'] unless @cookies['lang'].blank? 
-    lang ||= @env.HTTP_ACCEPT_LANGUAGE unless @env.HTTP_ACCEPT_LANGUAGE.blank?
-    lang ||= @env.HTTP_USER_AGENT =~ /[^a-z]([a-z]{2}(-[a-z]{2})?)[^a-z]/i && 
-              lang = $~[1] unless @env.HTTP_USER_AGENT.blank?
-    @cookies['lang'] = lang
-    
+
+    source = nil
+    lang = case
+    when !input['lang'].blank?
+      source = "'lang' request variable"
+      cookies['lang'] = input['lang']
+      input['lang']
+    when !cookies['lang'].blank?
+      source = "'lang' cookie"
+      cookies['lang']
+    when !@env['HTTP_ACCEPT_LANGUAGE'].blank?
+      source = "'HTTP_ACCEPT_LANGUAGE' header"
+      lang = @env['HTTP_ACCEPT_LANGUAGE']
+    when !@env['HTTP_USER_AGENT'].blank? && @env['HTTP_USER_AGENT'] =~ /[^a-z]([a-z]{2}(-[a-z]{2})?)[^a-z]/i
+      source = "'HTTP_USER_AGENT' header"
+      $~[1]
+    when !$CONF['default_locale'].blank?
+      source = "'default_locale' config option"
+      $CONF[:default_locale]
+    else
+      source = "default"
+      "en"
+    end
+
+    $LOG.debug "Detected locale is #{lang.inspect} (from #{source})"
+
     lang.gsub!('_','-')
     
     # TODO: Need to confirm that this method of splitting the accepted
@@ -52,6 +70,8 @@ module CASServer
     end
     
     chosen_lang = "en" if chosen_lang.blank?
+
+    $LOG.debug "Chosen locale is #{chosen_lang.inspect}"
     
     return chosen_lang
   end

data/lib/casserver/models.rb

@@ -7,6 +7,26 @@ module CASServer::Models
       self.consumed = Time.now
       self.save!
     end
+
+    def self.included(mod)
+      mod.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def cleanup(max_lifetime, max_unconsumed_lifetime)
+        transaction do
+          conditions = ["created_on < ? OR (consumed IS NULL AND created_on < ?)", 
+                          Time.now - max_lifetime,
+                          Time.now - max_unconsumed_lifetime]
+          expired_tickets_count = count(:conditions => conditions)
+
+          $LOG.debug("Destroying #{expired_tickets_count} expired #{self.name.demodulize}"+
+            "#{'s' if expired_tickets_count > 1}.") if expired_tickets_count > 0
+
+          destroy_all(conditions)
+        end
+      end
+    end
   end
   
   class Ticket < Base
@@ -14,12 +34,12 @@ module CASServer::Models
       ticket
     end
     
-    def self.cleanup_expired(expiry_time)
+    def self.cleanup(max_lifetime)
       transaction do
-        conditions = ["created_on < ?", Time.now - expiry_time]
+        conditions = ["created_on < ?", Time.now - max_lifetime]
         expired_tickets_count = count(:conditions => conditions)
           
-        $LOG.debug("Destroying #{expired_tickets_count} expired #{self.name.split('::').last}"+
+        $LOG.debug("Destroying #{expired_tickets_count} expired #{self.name.demodulize}"+
           "#{'s' if expired_tickets_count > 1}.") if expired_tickets_count > 0
       
         destroy_all(conditions)
@@ -36,7 +56,11 @@ module CASServer::Models
     set_table_name 'casserver_st'
     include Consumable
     
-    belongs_to :ticket_granting_ticket, :foreign_key => :tgt_id
+    belongs_to :granted_by_tgt, 
+      :class_name => 'CASServer::Models::TicketGrantingTicket',
+      :foreign_key => :granted_by_tgt_id
+    has_one :proxy_granting_ticket,
+      :foreign_key => :created_by_st_id
     
     def matches_service?(service)
       CASServer::CAS.clean_service_url(self.service) == 
@@ -45,7 +69,9 @@ module CASServer::Models
   end
   
   class ProxyTicket < ServiceTicket
-    belongs_to :proxy_granting_ticket
+    belongs_to :granted_by_pgt,
+      :class_name => 'CASServer::Models::ProxyGrantingTicket',
+      :foreign_key => :granted_by_pgt_id
   end
   
   class TicketGrantingTicket < Ticket
@@ -53,13 +79,17 @@ module CASServer::Models
     
     serialize :extra_attributes
     
-    has_many :service_tickets, :foreign_key => :tgt_id
+    has_many :granted_service_tickets, 
+      :class_name => 'CASServer::Models::ServiceTicket',
+      :foreign_key => :granted_by_tgt_id
   end
   
   class ProxyGrantingTicket < Ticket
     set_table_name 'casserver_pgt'
     belongs_to :service_ticket
-    has_many :proxy_tickets, :dependent => :destroy
+    has_many :granted_proxy_tickets, 
+      :class_name => 'CASServer::Models::ProxyTicket',
+      :foreign_key => :granted_by_pgt_id
   end
   
   class Error
@@ -220,4 +250,16 @@ module CASServer::Models
       remove_column :casserver_tgt, :extra_attributes
     end
   end
+
+  class RenamePgtForeignKeys < V 0.80
+    def self.up
+      rename_column :casserver_st,  :proxy_granting_ticket_id,  :granted_by_pgt_id
+      rename_column :casserver_st,  :tgt_id,                    :granted_by_tgt_id
+    end
+
+    def self.down
+      rename_column :casserver_st,  :granted_by_pgt_id,         :proxy_granting_ticket_id
+      rename_column :casserver_st,  :granted_by_tgt_id,         :tgt_id
+    end
+  end
 end

data/lib/casserver.rb

@@ -28,12 +28,31 @@ require "casserver/controllers"
 require "casserver/localization"
 
 def CASServer.create
-  CASServer::Models::Base.establish_connection($CONF[:database])
+  $LOG.info "Creating RubyCAS-Server with pid #{Process.pid}."
+
+
+  CASServer::Models::Base.establish_connection($CONF.database)
   CASServer::Models.create_schema
-  
-  CASServer::Models::ServiceTicket.cleanup_expired($CONF[:service_ticket_expiry])
-  CASServer::Models::LoginTicket.cleanup_expired($CONF[:login_ticket_expiry])
-  CASServer::Models::ProxyGrantingTicket.cleanup_expired($CONF[:proxy_granting_ticket_expiry])
-  CASServer::Models::TicketGrantingTicket.cleanup_expired($CONF[:ticket_granting_ticket_expiry])
+
+  #TODO: these warnings should eventually be deleted
+  if $CONF.service_ticket_expiry
+    $LOG.warn "The 'service_ticket_expiry' option has been renamed to 'maximum_unused_service_ticket_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_unused_service_ticket_lifetime ||= $CONF.service_ticket_expiry
+  end
+  if $CONF.login_ticket_expiry
+    $LOG.warn "The 'login_ticket_expiry' option has been renamed to 'maximum_unused_login_ticket_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_unused_login_ticket_lifetime ||= $CONF.login_ticket_expiry
+  end
+  if $CONF.ticket_granting_ticket_expiry || $CONF.proxy_granting_ticket_expiry
+    $LOG.warn "The 'ticket_granting_ticket_expiry' and 'proxy_granting_ticket_expiry' options have been renamed to 'maximum_session_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_session_lifetime ||= $CONF.ticket_granting_ticket_expiry || $CONF.proxy_granting_ticket_expiry
+  end
+
+  if $CONF.maximum_session_lifetime
+    CASServer::Models::ServiceTicket.cleanup($CONF.maximum_session_lifetime, $CONF.maximum_unused_service_ticket_lifetime)
+    CASServer::Models::LoginTicket.cleanup($CONF.maximum_session_lifetime, $CONF.maximum_unused_login_ticket_lifetime)
+    CASServer::Models::ProxyGrantingTicket.cleanup($CONF.maximum_session_lifetime)
+    CASServer::Models::TicketGrantingTicket.cleanup($CONF.maximum_session_lifetime)
+  end
 end