cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backout broken attempt at making case insensitive authentication work

Browse source 
on Postgres. As implemented this forces a table scan to authenticate
users which is ridiculous to save people pressing the shift key.
This commit is contained in:
Tom Hughes 2009-04-23 23:46:45 +00:00
parent e3ae690a00
commit 77a34278ca
3 changed files with 3 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/user.rb
View file

@ -42,13 +42,7 @@ class User < ActiveRecord::Base
def self.authenticate(options)
if options[:username] and options[:password]
environment = Rails.configuration.environment
adapter = Rails.configuration.database_configuration[environment]["adapter"]
if adapter == "postgresql"
user = find(:first, :conditions => ["email ILIKE ? OR display_name ILIKE ?", options[:username], options[:username]])
else
user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
end
user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
elsif options[:token]
token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])