Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dc45130c
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
dc45130c
编写于
4月 05, 2019
作者:
R
Ryuta Kamizono
提交者:
GitHub
4月 05, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #35700 from Futurelearn/seb-secure-password-fix
Reintroduce support for overriding `has_secure_password` attributes
上级
9e6f9bc7
4733e04d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
26 deletion
+30
-26
activemodel/lib/active_model/secure_password.rb
activemodel/lib/active_model/secure_password.rb
+30
-26
未找到文件。
activemodel/lib/active_model/secure_password.rb
浏览文件 @
dc45130c
...
...
@@ -69,38 +69,42 @@ def has_secure_password(attribute = :password, validations: true)
raise
end
attr_reader
attribute
mod
=
Module
.
new
do
attr_reader
attribute
define_method
(
"
#{
attribute
}
="
)
do
|
unencrypted_password
|
if
unencrypted_password
.
nil?
self
.
send
(
"
#{
attribute
}
_digest="
,
nil
)
elsif
!
unencrypted_password
.
empty?
instance_variable_set
(
"@
#{
attribute
}
"
,
unencrypted_password
)
cost
=
ActiveModel
::
SecurePassword
.
min_cost
?
BCrypt
::
Engine
::
MIN_COST
:
BCrypt
::
Engine
.
cost
self
.
send
(
"
#{
attribute
}
_digest="
,
BCrypt
::
Password
.
create
(
unencrypted_password
,
cost:
cost
))
define_method
(
"
#{
attribute
}
="
)
do
|
unencrypted_password
|
if
unencrypted_password
.
nil?
self
.
send
(
"
#{
attribute
}
_digest="
,
nil
)
elsif
!
unencrypted_password
.
empty?
instance_variable_set
(
"@
#{
attribute
}
"
,
unencrypted_password
)
cost
=
ActiveModel
::
SecurePassword
.
min_cost
?
BCrypt
::
Engine
::
MIN_COST
:
BCrypt
::
Engine
.
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
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
# 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
alias_method
:authenticate
,
:authenticate_password
if
attribute
==
:password
end
alias_method
:authenticate
,
:authenticate_password
if
attribute
==
:passwor
d
include
mo
d
if
validations
include
ActiveModel
::
Validations
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录