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

Merge pull request #42687 from NatMorcos/psych_4_load_secrets_with_aliases

Browse source 
unsafe_load secrets.yml with psych 4
This commit is contained in:
Ryuta Kamizono 2021-07-04 00:37:58 +09:00 committed by GitHub
commit 7179dcb269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
railties/lib/rails/secrets.rb
View file

@ -25,7 +25,10 @@ module Rails
paths.each_with_object(Hash.new) do |path, all_secrets|
require "erb"
secrets = YAML.load(ERB.new(preprocess(path)).result) || {}
source = ERB.new(preprocess(path)).result
secrets = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(source) : YAML.load(source)
secrets ||= {}
all_secrets.merge!(secrets["shared"].deep_symbolize_keys) if secrets["shared"]
all_secrets.merge!(secrets[env].deep_symbolize_keys) if secrets[env]
end