kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't overwrite config/master.key even on --force

Browse source 
See https://github.com/rails/rails/pull/31957#issuecomment-364817423

The purpose of `--force` is not to have any prompt whether a file should
be kept or overwritten. In general, all existing files should be overwritten.
However, `config/master.key` is special because it is git-ignored, and
overwriting it will cause the app not to run (since there won't be a way
to decrypt the credentials).

As a result, it's probably better to keep the existing config/master.key.
This commit is contained in:
claudiob 2018-02-12 21:48:24 -08:00
parent b9ed1fa444
commit b77861d0c9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/lib/rails/generators/rails/master_key/master_key_generator.rb
View file

@ -27,7 +27,9 @@ module Rails
end end
def add_master_key_file_silently(key = nil) def add_master_key_file_silently(key = nil)
key_file_generator.add_key_file_silently(MASTER_KEY_PATH, key) unless MASTER_KEY_PATH.exist?
key_file_generator.add_key_file_silently(MASTER_KEY_PATH, key)
end
end end
def ignore_master_key_file def ignore_master_key_file

3
railties/test/generators/app_generator_test.rb
View file

@ -653,10 +653,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_empty output assert_empty output
end end
def test_force_option def test_force_option_overwrites_every_file_except_master_key
run_generator [File.join(destination_root, "myapp")] run_generator [File.join(destination_root, "myapp")]
output = run_generator [File.join(destination_root, "myapp"), "--force"] output = run_generator [File.join(destination_root, "myapp"), "--force"]
assert_match(/force/, output) assert_match(/force/, output)
assert_no_match("force config/master.key", output)
end end
def test_application_name_with_spaces def test_application_name_with_spaces