Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a8a33ac6
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,发现更多精彩内容 >>
提交
a8a33ac6
编写于
10月 10, 2013
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12339 from tjschuck/bcrypt_cost_attr
Use bcrypt's public cost attr instead of internal constant
上级
9dbd2085
5d7b413d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
1 deletion
+13
-1
activemodel/CHANGELOG.md
activemodel/CHANGELOG.md
+4
-0
activemodel/lib/active_model/secure_password.rb
activemodel/lib/active_model/secure_password.rb
+1
-1
activemodel/test/cases/secure_password_test.rb
activemodel/test/cases/secure_password_test.rb
+8
-0
未找到文件。
activemodel/CHANGELOG.md
浏览文件 @
a8a33ac6
*
Fix
`has_secure_password`
to honor bcrypt-ruby's cost attribute.
*T.J. Schuck*
*
Updated the
`ActiveModel::Dirty#changed_attributes`
method to be indifferent between using
symbols and strings as keys.
...
...
activemodel/lib/active_model/secure_password.rb
浏览文件 @
a8a33ac6
...
...
@@ -103,7 +103,7 @@ def authenticate(unencrypted_password)
def
password
=
(
unencrypted_password
)
unless
unencrypted_password
.
blank?
@password
=
unencrypted_password
cost
=
ActiveModel
::
SecurePassword
.
min_cost
?
BCrypt
::
Engine
::
MIN_COST
:
BCrypt
::
Engine
::
DEFAULT_COST
cost
=
ActiveModel
::
SecurePassword
.
min_cost
?
BCrypt
::
Engine
::
MIN_COST
:
BCrypt
::
Engine
.
cost
self
.
password_digest
=
BCrypt
::
Password
.
create
(
unencrypted_password
,
cost:
cost
)
end
end
...
...
activemodel/test/cases/secure_password_test.rb
浏览文件 @
a8a33ac6
...
...
@@ -82,6 +82,14 @@ class SecurePasswordTest < ActiveModel::TestCase
assert_equal
BCrypt
::
Engine
::
DEFAULT_COST
,
@user
.
password_digest
.
cost
end
test
"Password digest cost honors bcrypt cost attribute when min_cost is false"
do
ActiveModel
::
SecurePassword
.
min_cost
=
false
BCrypt
::
Engine
.
cost
=
5
@user
.
password
=
"secret"
assert_equal
BCrypt
::
Engine
.
cost
,
@user
.
password_digest
.
cost
end
test
"Password digest cost can be set to bcrypt min cost to speed up tests"
do
ActiveModel
::
SecurePassword
.
min_cost
=
true
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录