diff options
author | Robert Speicher <robert@gitlab.com> | 2018-06-01 21:24:32 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-06-01 21:24:32 +0000 |
commit | f8bd8f4f062e518ab855a83f38965df51ec3b073 (patch) | |
tree | b6bd17f78f714d9882d3b1dc4c81b5dfc0d0d7a9 | |
parent | 2de002b3db1bc199755f8be212fa8804fcb80905 (diff) | |
parent | 78d78ad1991f0a27b8ff79614d09f85909d20ed1 (diff) | |
download | gitlab-ce-f8bd8f4f062e518ab855a83f38965df51ec3b073.tar.gz |
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
-rw-r--r-- | config/settings.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/settings.rb b/config/settings.rb index 4aa903109ea..58f38d103ea 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -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 |