diff options
| -rw-r--r-- | railties/lib/rails/secrets.rb | 5 | ||||
| -rw-r--r-- | railties/test/secrets_test.rb | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/railties/lib/rails/secrets.rb b/railties/lib/rails/secrets.rb index f42515f47d..77d9249c56 100644 --- a/railties/lib/rails/secrets.rb +++ b/railties/lib/rails/secrets.rb @@ -39,8 +39,7 @@ module Rails end def key - [(ENV["RAILS_MASTER_KEY"] || read_key_file || handle_missing_key)] - .pack("H*") + ENV["RAILS_MASTER_KEY"] || read_key_file || handle_missing_key end def encrypt(data) @@ -103,7 +102,7 @@ module Rails end def encryptor - @encryptor ||= ActiveSupport::MessageEncryptor.new(key, cipher: CIPHER) + @encryptor ||= ActiveSupport::MessageEncryptor.new([ key ].pack("H*"), cipher: CIPHER) end end end diff --git a/railties/test/secrets_test.rb b/railties/test/secrets_test.rb index 6650a37d2b..953408f0b4 100644 --- a/railties/test/secrets_test.rb +++ b/railties/test/secrets_test.rb @@ -54,10 +54,9 @@ class Rails::SecretsTest < ActiveSupport::TestCase test "reading from key file" do run_secrets_generator do - key = "00112233445566778899aabbccddeeff" - File.binwrite("config/secrets.yml.key", key) + File.binwrite("config/secrets.yml.key", "00112233445566778899aabbccddeeff") - assert_equal [key].pack("H*"), Rails::Secrets.key + assert_equal "00112233445566778899aabbccddeeff", Rails::Secrets.key end end |