rubycas-server 0.7.1.1 → 1.0

data/lib/casserver/authenticators/sql_authlogic.rb

@@ -0,0 +1,93 @@
+require 'casserver/authenticators/sql'
+
+# These were pulled directly from Authlogic, and new ones can be added
+# just by including new Crypto Providers
+require File.dirname(__FILE__) + '/authlogic_crypto_providers/aes256'
+require File.dirname(__FILE__) + '/authlogic_crypto_providers/bcrypt'
+require File.dirname(__FILE__) + '/authlogic_crypto_providers/md5'
+require File.dirname(__FILE__) + '/authlogic_crypto_providers/sha1'
+require File.dirname(__FILE__) + '/authlogic_crypto_providers/sha512'
+
+begin
+  require 'active_record'
+rescue LoadError
+  require 'rubygems'
+  require 'active_record'
+end
+
+# This is a version of the SQL authenticator that works nicely with Authlogic.
+# Passwords are encrypted the same way as it done in Authlogic.
+# Before use you this, you MUST configure rest_auth_digest_streches and rest_auth_site_key in
+# config.
+#
+# Using this authenticator requires restful authentication plugin on rails (client) side.
+#
+# * git://github.com/binarylogic/authlogic.git
+#
+# Usage:
+
+# authenticator:
+#   class: CASServer::Authenticators::SQLAuthlogic
+#   database:
+#     adapter: mysql
+#     database: some_database_with_users_table
+#     user: root
+#     password:
+#     server: localhost
+#   user_table: user
+#   username_column: login
+#   password_column: crypted_password
+#   salt_column: password_salt
+#   encryptor: Sha1
+#   encryptor_options:
+#     digest_format: --SALT--PASSWORD--
+#     stretches: 1
+#
+class CASServer::Authenticators::SQLAuthlogic < CASServer::Authenticators::SQL
+
+  def validate(credentials)
+    read_standard_credentials(credentials)
+    raise_if_not_configured
+
+    user_model = self.class.user_model
+
+    username_column = @options[:username_column] || "login"
+    password_column = @options[:password_column] || "crypted_password"
+    salt_column     = @options[:salt_column]
+
+    $LOG.debug "#{self.class}: [#{user_model}] " + "Connection pool size: #{user_model.connection_pool.instance_variable_get(:@checked_out).length}/#{user_model.connection_pool.instance_variable_get(:@connections).length}"
+    results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username])
+    user_model.connection_pool.checkin(user_model.connection)
+
+    begin
+      encryptor = eval("Authlogic::CryptoProviders::" + @options[:encryptor] || "Sha512")
+    rescue
+      $LOG.warn("Could not initialize Authlogic crypto class for '#{@options[:encryptor]}'")
+      encryptor = Authlogic::CryptoProviders::Sha512
+    end
+
+    @options[:encryptor_options].each do |name, value|
+      encryptor.send("#{name}=", value) if encryptor.respond_to?("#{name}=")
+    end
+
+    if results.size > 0
+      $LOG.warn("Multiple matches found for user '#{@username}'") if results.size > 1
+      user = results.first
+      tokens = [@password, (not salt_column.nil?) && user.send(salt_column) || nil].compact
+      crypted = user.send(password_column)
+
+      unless @options[:extra_attributes].blank?
+        if results.size > 1
+          $LOG.warn("#{self.class}: Unable to extract extra_attributes because multiple matches were found for #{@username.inspect}")
+        else
+          extract_extra(user)
+          log_extra
+        end
+      end
+
+      return encryptor.matches?(crypted, tokens)
+    else
+      return false
+    end
+  end
+end

data/lib/casserver/authenticators/sql_encrypted.rb

@@ -1,50 +1,18 @@
-require 'casserver/authenticators/base'
+require 'casserver/authenticators/sql'
 
 require 'digest/sha1'
 require 'digest/sha2'
+require 'crypt-isaac'
 
-$: << File.dirname(File.expand_path(__FILE__)) + "/../../../vendor/isaac_0.9.1"
-require 'crypt/ISAAC'
-
-begin
-  require 'active_record'
-rescue LoadError
-  require 'rubygems'
-  require 'active_record'
-end
-
-# This is a more secure version of the SQL authenticator. Passwords are encrypted 
+# This is a more secure version of the SQL authenticator. Passwords are encrypted
 # rather than being stored in plain text.
 #
 # Based on code contributed by Ben Mabey.
 #
 # Using this authenticator requires some configuration on the client side. Please see
 # http://code.google.com/p/rubycas-server/wiki/UsingTheSQLEncryptedAuthenticator
-class CASServer::Authenticators::SQLEncrypted < CASServer::Authenticators::Base
-
-  def validate(credentials)
-    read_standard_credentials(credentials)
-    
-    raise CASServer::AuthenticatorError, "Cannot validate credentials because the authenticator hasn't yet been configured" unless @options
-    raise CASServer::AuthenticatorError, "Invalid authenticator configuration!" unless @options[:database]
-    
-    CASUser.establish_connection @options[:database]
-    CASUser.set_table_name @options[:user_table] || "users"
-    
-    username_column = @options[:username_column] || "username"
-    
-    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)
-    else
-      return false
-    end
-  end
-  
-  # Include this module into your application's user model. 
+class CASServer::Authenticators::SQLEncrypted < CASServer::Authenticators::SQL
+  # Include this module into your application's user model.
   #
   # Your model must have an 'encrypted_password' column where the password will be stored,
   # and an 'encryption_salt' column that will be populated with a random string before
@@ -54,22 +22,54 @@ class CASServer::Authenticators::SQLEncrypted < CASServer::Authenticators::Base
       raise "#{self} should be inclued in an ActiveRecord class!" unless mod.respond_to?(:before_save)
       mod.before_save :generate_encryption_salt
     end
-    
+
     def encrypt(str)
+      generate_encryption_salt unless encryption_salt
       Digest::SHA256.hexdigest("#{encryption_salt}::#{str}")
     end
-    
+
     def password=(password)
       self[:encrypted_password] = encrypt(password)
     end
-    
+
     def generate_encryption_salt
       self.encryption_salt = Digest::SHA1.hexdigest(Crypt::ISAAC.new.rand(2**31).to_s) unless
         encryption_salt
     end
   end
-  
-  class CASUser < ActiveRecord::Base
-    include EncryptedPassword
+
+  def self.setup(options)
+    super(options)
+    user_model.__send__(:include, EncryptedPassword)
   end
-end
+
+  def validate(credentials)
+    read_standard_credentials(credentials)
+    raise_if_not_configured
+
+    user_model = self.class.user_model
+
+    username_column = @options[:username_column] || "username"
+    encrypt_function = @options[:encrypt_function] || 'user.encrypted_password == Digest::SHA256.hexdigest("#{user.encryption_salt}::#{@password}")'
+
+    $LOG.debug "#{self.class}: [#{user_model}] " + "Connection pool size: #{user_model.connection_pool.instance_variable_get(:@checked_out).length}/#{user_model.connection_pool.instance_variable_get(:@connections).length}"
+    results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username])
+    user_model.connection_pool.checkin(user_model.connection)
+    
+    if results.size > 0
+      $LOG.warn("Multiple matches found for user '#{@username}'") if results.size > 1
+      user = results.first
+      unless @options[:extra_attributes].blank?
+        if results.size > 1
+          $LOG.warn("#{self.class}: Unable to extract extra_attributes because multiple matches were found for #{@username.inspect}")
+        else
+          extract_extra(user)
+              log_extra
+        end
+      end
+      return eval(encrypt_function)
+    else
+      return false
+    end
+  end
+end

data/lib/casserver/authenticators/sql_md5.rb

@@ -9,11 +9,11 @@ require 'digest/md5'
 # Drupal, you should use 'name' for the :username_column config option, and
 # 'pass' for the :password_column.
 class CASServer::Authenticators::SQLMd5 < CASServer::Authenticators::SQL
-  
+
   protected
     def read_standard_credentials(credentials)
       super
       @password = Digest::MD5.hexdigest(@password)
     end
 
-end
+end

data/lib/casserver/authenticators/sql_rest_auth.rb

@@ -0,0 +1,82 @@
+require 'casserver/authenticators/sql_encrypted'
+
+require 'digest/sha1'
+
+begin
+  require 'active_record'
+rescue LoadError
+  require 'rubygems'
+  require 'active_record'
+end
+
+# This is a version of the SQL authenticator that works nicely with RestfulAuthentication.
+# Passwords are encrypted the same way as it done in RestfulAuthentication.
+# Before use you this, you MUST configure rest_auth_digest_streches and rest_auth_site_key in
+# config.
+#
+# Using this authenticator requires restful authentication plugin on rails (client) side.
+#
+# * git://github.com/technoweenie/restful-authentication.git
+#
+class CASServer::Authenticators::SQLRestAuth < CASServer::Authenticators::SQLEncrypted
+
+  def validate(credentials)
+    read_standard_credentials(credentials)
+    raise_if_not_configured
+
+    raise CASServer::AuthenticatorError, "You must specify a 'site_key' in the SQLRestAuth authenticator's configuration!" unless  @options[:site_key]
+    raise CASServer::AuthenticatorError, "You must specify 'digest_streches' in the SQLRestAuth authenticator's configuration!" unless  @options[:digest_streches]
+
+    user_model = self.class.user_model
+
+    username_column = @options[:username_column] || "email"
+
+    $LOG.debug "#{self.class}: [#{user_model}] " + "Connection pool size: #{user_model.connection_pool.instance_variable_get(:@checked_out).length}/#{user_model.connection_pool.instance_variable_get(:@connections).length}"
+    results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username])
+    user_model.connection_pool.checkin(user_model.connection)
+
+    if results.size > 0
+      $LOG.warn("Multiple matches found for user '#{@username}'") if results.size > 1
+      user = results.first
+      if user.crypted_password == user.encrypt(@password)
+        unless @options[:extra_attributes].blank?
+          extract_extra(user)
+          log_extra
+        end
+        return true
+      else
+        return false
+      end
+    else
+      return false
+    end
+  end
+
+  def self.setup(options)
+    super(options)
+    user_model.__send__(:include, EncryptedPassword)
+  end
+
+  module EncryptedPassword
+
+    def self.included(mod)
+      raise "#{self} should be inclued in an ActiveRecord class!" unless mod.respond_to?(:before_save)
+    end
+
+    def encrypt(password)
+      password_digest(password, self.salt)
+    end
+
+    def secure_digest(*args)
+      Digest::SHA1.hexdigest(args.flatten.join('--'))
+    end
+
+    def password_digest(password, salt)
+      digest = @options[:site_key]
+      @options[:digest_streches].times do
+        digest = secure_digest(digest, salt, password, @options[:site_key])
+      end
+      digest
+    end
+  end
+end

data/lib/casserver/authenticators/test.rb

@@ -1,19 +1,22 @@
+# encoding: UTF-8
 require 'casserver/authenticators/base'
 
-# Dummy authenticator used for testing. 
-# Accepts "testuser" for username and "testpassword" for password; otherwise authentication fails.
+# Dummy authenticator used for testing.
+# 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
   def validate(credentials)
     read_standard_credentials(credentials)
-    
+
     raise CASServer::AuthenticatorError, "Username is 'do_error'!" if @username == 'do_error'
-    
-    @extra_attributes[:test_string] = "testing!"
+
+    @extra_attributes[:test_utf_string] = "Ютф"
     @extra_attributes[:test_numeric] = 123.45
     @extra_attributes[:test_serialized] = {:foo => 'bar', :alpha => [1,2,3]}
-    
-    return @password == "testpassword"
+
+    valid_password = options[:password] || "testpassword"
+
+    return @password == valid_password
   end
 end

data/lib/casserver/cas.rb

@@ -1,28 +1,31 @@
 require 'uri'
 require 'net/https'
 
+require 'casserver/model'
+
 # Encapsulates CAS functionality. This module is meant to be included in
 # the CASServer::Controllers module.
 module CASServer::CAS
 
-  include CASServer::Models
+  include CASServer::Model
 
   def generate_login_ticket
     # 3.5 (login ticket)
     lt = LoginTicket.new
     lt.ticket = "LT-" + CASServer::Utils.random_string
-    lt.client_hostname = env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']
+
+    lt.client_hostname = @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']
     lt.save!
     $LOG.debug("Generated login ticket '#{lt.ticket}' for client" +
       " at '#{lt.client_hostname}'")
     lt
   end
-  
+
   # Creates a TicketGrantingTicket for the given username. This is done when the user logs in
   # for the first time to establish their SSO session (after their credentials have been validated).
   #
   # The optional 'extra_attributes' parameter takes a hash of additional attributes
-  # that will be sent along with the username in the CAS response to subsequent 
+  # that will be sent along with the username in the CAS response to subsequent
   # validation requests from clients.
   def generate_ticket_granting_ticket(username, extra_attributes = {})
     # 3.6 (ticket granting cookie/ticket)
@@ -30,152 +33,156 @@ module CASServer::CAS
     tgt.ticket = "TGC-" + CASServer::Utils.random_string
     tgt.username = username
     tgt.extra_attributes = extra_attributes
-    tgt.client_hostname = env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']
+    tgt.client_hostname = @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']
     tgt.save!
     $LOG.debug("Generated ticket granting ticket '#{tgt.ticket}' for user" +
-      " '#{tgt.username}' at '#{tgt.client_hostname}'" + 
+      " '#{tgt.username}' at '#{tgt.client_hostname}'" +
       (extra_attributes.blank? ? "" : " with extra attributes #{extra_attributes.inspect}"))
     tgt
   end
-  
+
   def generate_service_ticket(service, username, tgt)
     # 3.1 (service ticket)
     st = ServiceTicket.new
     st.ticket = "ST-" + CASServer::Utils.random_string
     st.service = service
     st.username = username
-    st.ticket_granting_ticket = tgt
-    st.client_hostname = env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']
+    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}'" +
       " for user '#{st.username}' at '#{st.client_hostname}'")
     st
   end
-  
+
   def generate_proxy_ticket(target_service, pgt)
     # 3.2 (proxy ticket)
     pt = ProxyTicket.new
     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.client_hostname = env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']
+    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}'" +
       " for user '#{pt.username}' at '#{pt.client_hostname}' using proxy-granting" +
       " ticket '#{pgt.ticket}'")
     pt
   end
-  
+
   def generate_proxy_granting_ticket(pgt_url, st)
     uri = URI.parse(pgt_url)
     https = Net::HTTP.new(uri.host,uri.port)
     https.use_ssl = true
-    
+
     # Here's what's going on here:
-    # 
+    #
     #   1. We generate a ProxyGrantingTicket (but don't store it in the database just yet)
     #   2. Deposit the PGT and it's associated IOU at the proxy callback URL.
     #   3. If the proxy callback URL responds with HTTP code 200, store the PGT and return it;
     #      otherwise don't save it and return nothing.
-    #      
+    #
     https.start do |conn|
       path = uri.path.empty? ? '/' : uri.path
+      path += '?' + uri.query unless (uri.query.nil? || uri.query.empty?)
       
       pgt = ProxyGrantingTicket.new
       pgt.ticket = "PGT-" + CASServer::Utils.random_string(60)
       pgt.iou = "PGTIOU-" + CASServer::Utils.random_string(57)
       pgt.service_ticket_id = st.id
-      pgt.client_hostname = env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']
-      
+      pgt.client_hostname = @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']
+
       # FIXME: The CAS protocol spec says to use 'pgt' as the parameter, but in practice
       #         the JA-SIG and Yale server implementations use pgtId. We'll go with the
       #         in-practice standard.
       path += (uri.query.nil? || uri.query.empty? ? '?' : '&') + "pgtId=#{pgt.ticket}&pgtIou=#{pgt.iou}"
-      
+
       response = conn.request_get(path)
       # TODO: follow redirects... 2.5.4 says that redirects MAY be followed
+      # NOTE: The following response codes are valid according to the JA-SIG implementation even without following redirects
       
-      if response.code.to_i == 200
+      if %w(200 202 301 302 304).include?(response.code)
         # 3.4 (proxy-granting ticket IOU)
         pgt.save!
         $LOG.debug "PGT generated for pgt_url '#{pgt_url}': #{pgt.inspect}"
         pgt
       else
         $LOG.warn "PGT callback server responded with a bad result code '#{response.code}'. PGT will not be stored."
+        nil
       end
     end
   end
-  
+
   def validate_login_ticket(ticket)
     $LOG.debug("Validating login ticket '#{ticket}'")
-  
+
     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 < CASServer::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 < settings.config[: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
-    
+
     error
   end
-  
+
   def validate_ticket_granting_ticket(ticket)
     $LOG.debug("Validating ticket granting ticket '#{ticket}'")
-  
+
     if ticket.nil?
       error = "No ticket granting ticket given."
-      $LOG.debug(error)
+      $LOG.debug error
     elsif tgt = TicketGrantingTicket.find_by_ticket(ticket)
-      if CASServer::Conf.expire_sessions && Time.now - tgt.created_on > CASServer::Conf.ticket_granting_ticket_expiry
+      if settings.config[:maximum_session_lifetime] && Time.now - tgt.created_on > settings.config[:maximum_session_lifetime]
+	tgt.destroy
         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)."
       $LOG.warn(error)
     end
-    
+
     [tgt, error]
   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}")
-      elsif st.kind_of?(CASServer::Models::ProxyTicket) && !allow_proxy_tickets
+        $LOG.warn "#{error.code} - #{error.message}"
+      elsif st.kind_of?(CASServer::Model::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 > CASServer::Conf.service_ticket_expiry
+        $LOG.warn "#{error.code} - #{error.message}"
+      elsif Time.now - st.created_on > settings.config[: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
@@ -183,30 +190,30 @@ module CASServer::CAS
       error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' not recognized.")
       $LOG.warn("#{error.code} - #{error.message}")
     end
-    
+
     if st
       st.consume!
     end
-    
-    
+
+
     [st, error]
   end
-  
+
   def validate_proxy_ticket(service, ticket)
     pt, error = validate_service_ticket(service, ticket, true)
-    
-    if pt.kind_of?(CASServer::Models::ProxyTicket) && !error
-      if not pt.proxy_granting_ticket
+
+    if pt.kind_of?(CASServer::Model::ProxyTicket) && !error
+      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
-    
+
     [pt, error]
   end
-  
+
   def validate_proxy_granting_ticket(ticket)
     if ticket.nil?
       error = Error.new(:INVALID_REQUEST, "pgt parameter was missing in the request.")
@@ -222,10 +229,10 @@ module CASServer::CAS
       error = Error.new(:BAD_PGT, "Invalid proxy granting ticket '#{ticket}' (no matching ticket found in the database).")
       $LOG.warn("#{error.code} - #{error.message}")
     end
-    
+
     [pgt, error]
   end
-  
+
   # Takes an existing ServiceTicket object (presumably pulled from the database)
   # and sends a POST with logout information to the service that the ticket
   # was generated for.
@@ -234,26 +241,15 @@ module CASServer::CAS
   # See http://www.ja-sig.org/wiki/display/CASUM/Single+Sign+Out
   def send_logout_notification_for_service_ticket(st)
     uri = URI.parse(st.service)
-    http = Net::HTTP.new(uri.host, uri.port)
-    #http.use_ssl = true if uri.scheme = 'https'
-    
+    uri.path = '/' if uri.path.empty?
     time = Time.now
     rand = CASServer::Utils.random_string
-    
-    path = uri.path
-    path = '/' if path.empty?
-    
-    req = Net::HTTP::Post.new(path)
-    req.set_form_data(
-      'logoutRequest' => %{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
-<saml:NameID></saml:NameID>
-<samlp:SessionIndex>#{st.ticket}</samlp:SessionIndex>
-</samlp:LogoutRequest>}
-    )
-    
-    http.start do |conn|
-      response = conn.request(req)
-            
+
+    begin
+      response = Net::HTTP.post_form(uri, {'logoutRequest' => URI.escape(%{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
+        <saml:NameID></saml:NameID>
+        <samlp:SessionIndex>#{st.ticket}</samlp:SessionIndex>
+        </samlp:LogoutRequest>})})
       if response.kind_of? Net::HTTPSuccess
         $LOG.info "Logout notification successfully posted to #{st.service.inspect}."
         return true
@@ -261,16 +257,19 @@ module CASServer::CAS
         $LOG.error "Service #{st.service.inspect} responed to logout notification with code '#{response.code}'!"
         return false
       end
+    rescue Exception => e
+      $LOG.error "Failed to send logout notification to service #{st.service.inspect} due to #{e}"
+      return false
     end
   end
-  
+
   def service_uri_with_ticket(service, st)
-    raise ArgumentError, "Second argument must be a ServiceTicket!" unless st.kind_of? CASServer::Models::ServiceTicket
-    
+    raise ArgumentError, "Second argument must be a ServiceTicket!" unless st.kind_of? CASServer::Model::ServiceTicket
+
     # This will choke with a URI::InvalidURIError if service URI is not properly URI-escaped...
     # This exception is handled further upstream (i.e. in the controller).
     service_uri = URI.parse(service)
-    
+
     if service.include? "?"
       if service_uri.query.empty?
         query_separator = ""
@@ -280,11 +279,11 @@ module CASServer::CAS
     else
       query_separator = "?"
     end
-    
+
     service_with_ticket = service + query_separator + "ticket=" + st.ticket
     service_with_ticket
   end
-  
+
   # Strips CAS-related parameters from a service URL and normalizes it,
   # removing trailing / and ?. Also converts any spaces to +.
   #
@@ -299,17 +298,18 @@ 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
       dirty_service != clean_service
-      
+
     return clean_service
   end
   module_function :clean_service_url
-  
+
 end