ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-27 03:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix user hash error

Browse source
This commit is contained in:
Ari Timonen 2021-08-05 20:01:40 +03:00
parent 8326a49ccb
commit 8e389ff824
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -467,7 +467,13 @@ class User < ActiveRecord::Base
case user.password_hash case user.password_hash
when User::PASSWORD_SCRYPT when User::PASSWORD_SCRYPT
# FIXME: If exception occurs here, user cannot log in # FIXME: If exception occurs here, user cannot log in
begin
pass = SCrypt::Password.new(user.password) pass = SCrypt::Password.new(user.password)
rescue
logger.error "User (%s) password hash is invalid."
flash[:error] = "Password hash is invalid, please use forget password functionality or contact admin."
return nil
end
return user if pass == login[:password] return user if pass == login[:password]
when User::PASSWORD_MD5_SCRYPT when User::PASSWORD_MD5_SCRYPT
pass = SCrypt::Password.new(user.password) pass = SCrypt::Password.new(user.password)