TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixed to RAILS_MASTER_KEY as a default env key for decrypting.

Browse Source 
Fixes mistake left in https://github.com/rails/rails/pull/33521/files#diff-2a29095afcfe2c683b82a779a94c2208R59
and misunderstanding in d69b04de0f
This commit is contained in:
Wojciech Wnętrzak 2018-09-20 12:23:47 +02:00
parent 2487a37986
commit b4b70ef2bf
No known key found for this signature in database
GPG Key ID: 0EABD3BE530ECAC6
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG.md
View File

@ -1,7 +1,7 @@
* Support environment specific credentials file.
For `production` environment look first for `config/credentials/production.yml.enc` file that can be decrypted by
`ENV["RAILS_PRODUCTION_KEY"]` or `config/credentials/production.key` master key.
`ENV["RAILS_MASTER_KEY"]` or `config/credentials/production.key` master key.
Edit given environment credentials file by command `rails credentials:edit --environment production`.
Default paths can be overwritten by setting `config.credentials.content_path` and `config.credentials.key_path`.

2
railties/lib/rails/application.rb
View File

@ -440,7 +440,7 @@ def secret_key_base
# +config/master.key+.
# If specific credentials file exists for current environment, it takes precedence, thus for +production+
# environment look first for +config/credentials/production.yml.enc+ with master key taken
# from <tt>ENV["RAILS_PRODUCTION_KEY"]</tt> or from loading +config/credentials/production.key+.
# from <tt>ENV["RAILS_MASTER_KEY"]</tt> or from loading +config/credentials/production.key+.
# Default behavior can be overwritten by setting +config.credentials.content_path+ and +config.credentials.key_path+.
def credentials
@credentials ||= encrypted(config.credentials.content_path, key_path: config.credentials.key_path)

2
railties/lib/rails/commands/credentials/USAGE
View File

@ -43,7 +43,7 @@ from leaking.
It is possible to have credentials for each environment. If the file for current environment exists it will take
precedence over `config/credentials.yml.enc`, thus for `production` environment first look for
`config/credentials/production.yml.enc` that can be decrypted using master key taken from `ENV["RAILS_PRODUCTION_KEY"]`
`config/credentials/production.yml.enc` that can be decrypted using master key taken from `ENV["RAILS_MASTER_KEY"]`
or stored in `config/credentials/production.key`.
To edit given file use command `rails credentials:edit --environment production`
Default paths can be overwritten by setting `config.credentials.content_path` and `config.credentials.key_path`.

14
railties/lib/rails/commands/credentials/credentials_command.rb
View File

@ -24,13 +24,13 @@ def edit
ensure_editor_available(command: "bin/rails credentials:edit") || (return)
encrypted = Rails.application.encrypted(content_path, key_path: key_path, env_key: env_key)
encrypted = Rails.application.encrypted(content_path, key_path: key_path)
ensure_encryption_key_has_been_added(key_path) if encrypted.key.nil?
ensure_encrypted_file_has_been_added(content_path, key_path)
catch_editing_exceptions do
change_encrypted_file_in_system_editor(content_path, key_path, env_key)
change_encrypted_file_in_system_editor(content_path, key_path)
end
say "File encrypted and saved."
@ -41,7 +41,7 @@ def edit
def show
require_application_and_environment!
encrypted = Rails.application.encrypted(content_path, key_path: key_path, env_key: env_key)
encrypted = Rails.application.encrypted(content_path, key_path: key_path)
say encrypted.read.presence || missing_encrypted_message(key: encrypted.key, key_path: key_path, file_path: content_path)
end
@ -55,10 +55,6 @@ def key_path
options[:environment] ? "config/credentials/#{options[:environment]}.key" : "config/master.key"
end
def env_key
options[:environment] ? "RAILS_#{options[:environment].upcase}_KEY" : "RAILS_MASTER_KEY"
end
def ensure_encryption_key_has_been_added(key_path)
encryption_key_file_generator.add_key_file(key_path)
@ -69,8 +65,8 @@ def ensure_encrypted_file_has_been_added(file_path, key_path)
encrypted_file_generator.add_encrypted_file_silently(file_path, key_path)
end
def change_encrypted_file_in_system_editor(file_path, key_path, env_key)
Rails.application.encrypted(file_path, key_path: key_path, env_key: env_key).change do |tmp_path|
def change_encrypted_file_in_system_editor(file_path, key_path)
Rails.application.encrypted(file_path, key_path: key_path).change do |tmp_path|
system("#{ENV["EDITOR"]} #{tmp_path}")
end
end