TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #35700 from Futurelearn/seb-secure-password-fix

Browse Source 
Reintroduce support for overriding `has_secure_password` attributes
This commit is contained in:
Ryuta Kamizono 2019-04-05 01:19:08 +09:00 committed by GitHub
commit dc45130c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
activemodel/lib/active_model/secure_password.rb
View File

@ -69,38 +69,42 @@ def has_secure_password(attribute = :password, validations: true)
raise raise
end end
attr_reader attribute mod = Module.new do
attr_reader attribute
define_method("#{attribute}=") do |unencrypted_password| define_method("#{attribute}=") do |unencrypted_password|
if unencrypted_password.nil? if unencrypted_password.nil?
self.send("#{attribute}_digest=", nil) self.send("#{attribute}_digest=", nil)
elsif !unencrypted_password.empty? elsif !unencrypted_password.empty?
instance_variable_set("@#{attribute}", unencrypted_password) instance_variable_set("@#{attribute}", unencrypted_password)
cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
self.send("#{attribute}_digest=", BCrypt::Password.create(unencrypted_password, cost: cost)) self.send("#{attribute}_digest=", BCrypt::Password.create(unencrypted_password, cost: cost))
end
end end
define_method("#{attribute}_confirmation=") do |unencrypted_password|
instance_variable_set("@#{attribute}_confirmation", unencrypted_password)
end
# Returns +self+ if the password is correct, otherwise +false+.
#
# class User < ActiveRecord::Base
# has_secure_password validations: false
# end
#
# user = User.new(name: 'david', password: 'mUc3m00RsqyRe')
# user.save
# user.authenticate_password('notright') # => false
# user.authenticate_password('mUc3m00RsqyRe') # => user
define_method("authenticate_#{attribute}") do |unencrypted_password|
attribute_digest = send("#{attribute}_digest")
BCrypt::Password.new(attribute_digest).is_password?(unencrypted_password) && self
end
alias_method :authenticate, :authenticate_password if attribute == :password
end end
define_method("#{attribute}_confirmation=") do |unencrypted_password| include mod
instance_variable_set("@#{attribute}_confirmation", unencrypted_password)
end
# Returns +self+ if the password is correct, otherwise +false+.
#
# class User < ActiveRecord::Base
# has_secure_password validations: false
# end
#
# user = User.new(name: 'david', password: 'mUc3m00RsqyRe')
# user.save
# user.authenticate_password('notright') # => false
# user.authenticate_password('mUc3m00RsqyRe') # => user
define_method("authenticate_#{attribute}") do |unencrypted_password|
attribute_digest = send("#{attribute}_digest")
BCrypt::Password.new(attribute_digest).is_password?(unencrypted_password) && self
end
alias_method :authenticate, :authenticate_password if attribute == :password
if validations if validations
include ActiveModel::Validations include ActiveModel::Validations