diff options
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/credentials/USAGE | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/credentials/credentials_command.rb | 14 |
3 files changed, 7 insertions, 11 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 3cc5b70e9e..656786246d 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -440,7 +440,7 @@ module Rails # +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) diff --git a/railties/lib/rails/commands/credentials/USAGE b/railties/lib/rails/commands/credentials/USAGE index 513afcbc78..6b33d1ab74 100644 --- a/railties/lib/rails/commands/credentials/USAGE +++ b/railties/lib/rails/commands/credentials/USAGE @@ -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`. diff --git a/railties/lib/rails/commands/credentials/credentials_command.rb b/railties/lib/rails/commands/credentials/credentials_command.rb index 97e51786e7..4b30d208e0 100644 --- a/railties/lib/rails/commands/credentials/credentials_command.rb +++ b/railties/lib/rails/commands/credentials/credentials_command.rb @@ -24,13 +24,13 @@ module Rails 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 @@ module Rails 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 @@ module Rails 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 @@ module Rails 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 |