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

Revert displaying master key generation info on rails new.

Browse source 
It's already a default for new apps, like so many others, so
no need to flaunt it.
This commit is contained in:
Kasper Timm Hansen 2017-11-12 20:29:35 +01:00
parent bb30f05f38
commit 5744d00f5d
No known key found for this signature in database
GPG key ID: 191153215EDA53D8
3 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
railties/lib/rails/commands/credentials/credentials_command.rb
View file

@ -53,6 +53,7 @@ module Rails
def ensure_master_key_has_been_added
master_key_generator.add_master_key_file
master_key_generator.ignore_master_key_file
end
def ensure_credentials_have_been_added

10
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -162,20 +162,14 @@ module Rails
return if options[:pretend] || options[:dummy_app]
require "rails/generators/rails/master_key/master_key_generator"
after_bundle do
Rails::Generators::MasterKeyGenerator.new([], quiet: options[:quiet]).add_master_key_file
end
Rails::Generators::MasterKeyGenerator.new([], quiet: options[:quiet]).add_master_key_file_silently
end
def credentials
return if options[:pretend] || options[:dummy_app]
require "rails/generators/rails/credentials/credentials_generator"
after_bundle do
Rails::Generators::CredentialsGenerator.new([], quiet: options[:quiet]).add_credentials_file_silently
end
Rails::Generators::CredentialsGenerator.new([], quiet: options[:quiet]).add_credentials_file_silently
end
def database_yml

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

@ -20,29 +20,31 @@ module Rails
log "If you lose the key, no one, including you, can access anything encrypted with it."
log ""
create_file MASTER_KEY_PATH, key
add_master_key_file_silently key
log ""
end
end
ignore_master_key_file
def add_master_key_file_silently(key = nil)
create_file MASTER_KEY_PATH, key || ActiveSupport::EncryptedFile.generate_key
end
def ignore_master_key_file
if File.exist?(".gitignore")
unless File.read(".gitignore").include?(key_ignore)
log "Ignoring #{MASTER_KEY_PATH} so it won't end up in Git history:"
log ""
append_to_file ".gitignore", key_ignore
log ""
end
else
log "IMPORTANT: Don't commit #{MASTER_KEY_PATH}. Add this to your ignore file:"
log key_ignore, :on_green
log ""
end
end
private
def ignore_master_key_file
if File.exist?(".gitignore")
unless File.read(".gitignore").include?(key_ignore)
log "Ignoring #{MASTER_KEY_PATH} so it won't end up in Git history:"
log ""
append_to_file ".gitignore", key_ignore
log ""
end
else
log "IMPORTANT: Don't commit #{MASTER_KEY_PATH}. Add this to your ignore file:"
log key_ignore, :on_green
log ""
end
end
def key_ignore
[ "", "# Ignore master key for decrypting credentials and more.", "/#{MASTER_KEY_PATH}", "" ].join("\n")
end