Commit f8bd8f4f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-add-ruby-2.4-comment' into 'master'

Add comment about the need for truncating keys in Ruby 2.4

See merge request gitlab-org/gitlab-ce!19330
parents 2de002b3 78d78ad1
......@@ -85,7 +85,14 @@ class Settings < Settingslogic
File.expand_path(path, Rails.root)
end
# Returns a 256-bit key for attr_encrypted
def attr_encrypted_db_key_base
# Ruby 2.4+ requires passing in the exact required length for OpenSSL keys
# (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1).
# Previous versions quietly truncated the input.
#
# The default mode for the attr_encrypted gem is to use a 256-bit key.
# We truncate the 128-byte string to 32 bytes.
Gitlab::Application.secrets.db_key_base[0..31]
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment