Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
179c96ca
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,发现更多精彩内容 >>
提交
179c96ca
编写于
7月 09, 2017
作者:
K
Kasper Timm Hansen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #29721 from y-yagi/fix_29696
Treat secrets as binary
上级
7f934287
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
56 addition
and
2 deletion
+56
-2
railties/lib/rails/secrets.rb
railties/lib/rails/secrets.rb
+4
-2
railties/test/secrets_test.rb
railties/test/secrets_test.rb
+52
-0
未找到文件。
railties/lib/rails/secrets.rb
浏览文件 @
179c96ca
...
@@ -42,7 +42,7 @@ def template
...
@@ -42,7 +42,7 @@ def template
<<-
end_of_template
.
strip_heredoc
<<-
end_of_template
.
strip_heredoc
# See `secrets.yml` for tips on generating suitable keys.
# See `secrets.yml` for tips on generating suitable keys.
# production:
# production:
# external_api_key: 1466aac22e6a869134be3d09b9e89232fc2c2289
…
# external_api_key: 1466aac22e6a869134be3d09b9e89232fc2c2289
end_of_template
end_of_template
end
end
...
@@ -101,10 +101,12 @@ def preprocess(path)
...
@@ -101,10 +101,12 @@ def preprocess(path)
def
writing
(
contents
)
def
writing
(
contents
)
tmp_path
=
File
.
join
(
Dir
.
tmpdir
,
File
.
basename
(
path
))
tmp_path
=
File
.
join
(
Dir
.
tmpdir
,
File
.
basename
(
path
))
File
.
write
(
tmp_path
,
contents
)
IO
.
bin
write
(
tmp_path
,
contents
)
yield
tmp_path
yield
tmp_path
updated_contents
=
IO
.
binread
(
tmp_path
)
write
(
File
.
read
(
tmp_path
))
write
(
File
.
read
(
tmp_path
))
ensure
ensure
FileUtils
.
rm
(
tmp_path
)
if
File
.
exist?
(
tmp_path
)
FileUtils
.
rm
(
tmp_path
)
if
File
.
exist?
(
tmp_path
)
...
...
railties/test/secrets_test.rb
浏览文件 @
179c96ca
...
@@ -111,6 +111,58 @@ def teardown
...
@@ -111,6 +111,58 @@ def teardown
end
end
end
end
test
"do not update secrets.yml.enc when secretes do not change"
do
run_secrets_generator
do
Dir
.
chdir
(
app_path
)
do
Rails
::
Secrets
.
read_for_editing
do
|
tmp_path
|
File
.
write
(
tmp_path
,
"Empty streets, empty nights. The Downtown Lights."
)
end
FileUtils
.
cp
(
"config/secrets.yml.enc"
,
"config/secrets.yml.enc.bk"
)
Rails
::
Secrets
.
read_for_editing
do
|
tmp_path
|
File
.
write
(
tmp_path
,
"Empty streets, empty nights. The Downtown Lights."
)
end
assert_equal
File
.
read
(
"config/secrets.yml.enc.bk"
),
File
.
read
(
"config/secrets.yml.enc"
)
end
end
end
test
"can read secrets written in binary"
do
run_secrets_generator
do
secrets
=
<<-
end_of_secrets
production:
api_key: 00112233445566778899aabbccddeeff…
end_of_secrets
Rails
::
Secrets
.
write
(
secrets
.
force_encoding
(
Encoding
::
ASCII_8BIT
))
Rails
::
Secrets
.
read_for_editing
do
|
tmp_path
|
assert_match
(
/production:\n\s*api_key: 00112233445566778899aabbccddeeff…\n/
,
File
.
read
(
tmp_path
))
end
assert_equal
"00112233445566778899aabbccddeeff…
\n
"
,
`bin/rails runner -e production "puts Rails.application.secrets.api_key"`
end
end
test
"can read secrets written in non-binary"
do
run_secrets_generator
do
secrets
=
<<-
end_of_secrets
production:
api_key: 00112233445566778899aabbccddeeff…
end_of_secrets
Rails
::
Secrets
.
write
(
secrets
)
Rails
::
Secrets
.
read_for_editing
do
|
tmp_path
|
assert_equal
(
secrets
.
force_encoding
(
Encoding
::
ASCII_8BIT
),
IO
.
binread
(
tmp_path
))
end
assert_equal
"00112233445566778899aabbccddeeff…
\n
"
,
`bin/rails runner -e production "puts Rails.application.secrets.api_key"`
end
end
private
private
def
run_secrets_generator
def
run_secrets_generator
Dir
.
chdir
(
app_path
)
do
Dir
.
chdir
(
app_path
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录