summaryrefslogtreecommitdiff
path: root/spec/config
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-11-28 12:00:17 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-11-28 12:00:17 +0100
commit4c7665f2f930bba855646143684070544044de10 (patch)
tree4de3284dce6a99344bde2443509d0034f78794a6 /spec/config
parentb7f35e893999b6cf1bc003747f28861be3412ab1 (diff)
downloadgitlab-ce-4c7665f2f930bba855646143684070544044de10.tar.gz
Pad encryption keys with UTF-8 0 instead of \0 char
Diffstat (limited to 'spec/config')
-rw-r--r--spec/config/settings_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index f579ecacd3a..c89b5f48dc0 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -24,7 +24,7 @@ describe Settings do
it 'expands db key base secret to 12 bytes' do
expect(described_class.attr_encrypted_db_key_base_12)
- .to eq(('a' * 10) + ("\0" * 2))
+ .to eq(('a' * 10) + ('0' * 2))
end
end
@@ -53,7 +53,7 @@ describe Settings do
end
it 'expands db key base secret to 32 bytes' do
- expanded_key_base = ('a' * 10) + ("\0" * 22)
+ expanded_key_base = ('a' * 10) + ('0' * 22)
expect(expanded_key_base.bytesize).to eq 32
expect(described_class.attr_encrypted_db_key_base_32)
@@ -84,7 +84,7 @@ describe Settings do
it 'does not use more than 32 bytes' do
db_key_base = described_class.attr_encrypted_db_key_base_32
- expect(db_key_base).to eq '❤❤❤❤❤❤' + ("\0" * 14)
+ expect(db_key_base).to eq '❤❤❤❤❤❤' + ('0' * 14)
expect(db_key_base.bytesize).to eq 32
end
end
@@ -99,7 +99,7 @@ describe Settings do
it 'does not use more than 32 bytes' do
db_key_base = described_class.attr_encrypted_db_key_base_32
- expect(db_key_base).to eq(('❤' * 10) + ("\0" * 2))
+ expect(db_key_base).to eq(('❤' * 10) + ('0' * 2))
expect(db_key_base.bytesize).to eq 32
end
end