diff --git a/lib/casserver/authenticators/sql.rb b/lib/casserver/authenticators/sql.rb index f9e50fe8..3e955110 100644 --- a/lib/casserver/authenticators/sql.rb +++ b/lib/casserver/authenticators/sql.rb @@ -153,6 +153,6 @@ def log_connection_pool_size end def matching_users - user_model.find(:all, :conditions => ["#{username_column} = ? AND #{password_column} = ?", @username, @password]) + user_model.where("#{username_column} = ? AND #{password_column} = ?", @username, @password) end end diff --git a/lib/casserver/authenticators/sql_authlogic.rb b/lib/casserver/authenticators/sql_authlogic.rb index 7e1d5903..a75d8e79 100644 --- a/lib/casserver/authenticators/sql_authlogic.rb +++ b/lib/casserver/authenticators/sql_authlogic.rb @@ -94,6 +94,6 @@ def validate(credentials) protected def matching_users - user_model.find(:all, :conditions => ["#{username_column} = ?", @username]) + user_model.where("#{username_column} = ?", @username) end end diff --git a/lib/casserver/authenticators/sql_bcrypt.rb b/lib/casserver/authenticators/sql_bcrypt.rb index 34943f45..15b2af8d 100644 --- a/lib/casserver/authenticators/sql_bcrypt.rb +++ b/lib/casserver/authenticators/sql_bcrypt.rb @@ -10,8 +10,8 @@ class CASServer::Authenticators::SQLBcrypt < CASServer::Authenticators::SQL protected def matching_users - results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username]) + results = user_model.where("#{username_column} = ?", @username) results.select { |user| BCrypt::Password.new(user.send(password_column.to_sym)) == @password } end -end \ No newline at end of file +end diff --git a/lib/casserver/authenticators/sql_encrypted.rb b/lib/casserver/authenticators/sql_encrypted.rb index 7593b107..ae2da94f 100644 --- a/lib/casserver/authenticators/sql_encrypted.rb +++ b/lib/casserver/authenticators/sql_encrypted.rb @@ -53,7 +53,7 @@ def validate(credentials) encrypt_function = @options[:encrypt_function] || 'user.encrypted_password == Digest::SHA256.hexdigest("#{user.encryption_salt}::#{@password}")' log_connection_pool_size - results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username]) + results = user_model.where("#{username_column} = ?", @username) user_model.connection_pool.checkin(user_model.connection) if results.size > 0 diff --git a/lib/casserver/authenticators/sql_rest_auth.rb b/lib/casserver/authenticators/sql_rest_auth.rb index 00f939dc..4c0ff988 100644 --- a/lib/casserver/authenticators/sql_rest_auth.rb +++ b/lib/casserver/authenticators/sql_rest_auth.rb @@ -32,7 +32,7 @@ def validate(credentials) username_column = @options[:username_column] || "email" log_connection_pool_size - results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username]) + results = user_model.where("#{username_column} = ?", @username) user_model.connection_pool.checkin(user_model.connection) if results.size > 0 diff --git a/lib/casserver/server.rb b/lib/casserver/server.rb index 3b87c012..5602db93 100644 --- a/lib/casserver/server.rb +++ b/lib/casserver/server.rb @@ -533,9 +533,7 @@ def self.init_database! st.destroy end - pgts = CASServer::Model::ProxyGrantingTicket.find(:all, - :conditions => [CASServer::Model::ServiceTicket.quoted_table_name+".username = ?", tgt.username], - :include => :service_ticket) + pgts = CASServer::Model::ProxyGrantingTicket.includes(:service_ticket).where(CASServer::Model::ServiceTicket.quoted_table_name+".username = ?", tgt.username) pgts.each do |pgt| $LOG.debug("Deleting Proxy-Granting Ticket '#{pgt}' for user '#{pgt.service_ticket.username}'") pgt.destroy @@ -785,4 +783,4 @@ def authenticated_username end end end -end \ No newline at end of file +end