diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-13 18:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-13 18:09:34 +0300 |
commit | c4eeda2d3d048e84b331f416472e99ed0e116904 (patch) | |
tree | d2ac30119226e46f54f41961e3eed2cd5b5bdb5b /spec/experiments | |
parent | cdd5eba514e79c7801ff2eeb76e915e3f31ca5d7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/experiments')
-rw-r--r-- | spec/experiments/application_experiment_spec.rb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/spec/experiments/application_experiment_spec.rb b/spec/experiments/application_experiment_spec.rb index 13c12afc15d..a39890dd530 100644 --- a/spec/experiments/application_experiment_spec.rb +++ b/spec/experiments/application_experiment_spec.rb @@ -11,6 +11,7 @@ RSpec.describe ApplicationExperiment, :experiment do before do stub_feature_flag_definition(:namespaced_stub, feature_definition) + allow(Gitlab::FIPS).to receive(:enabled?).and_return(true) allow(application_experiment).to receive(:enabled?).and_return(true) end @@ -137,7 +138,11 @@ RSpec.describe ApplicationExperiment, :experiment do }, { schema: 'iglu:com.gitlab/gitlab_experiment/jsonschema/1-0-0', - data: { experiment: 'namespaced/stub', key: '86208ac54ca798e11f127e8b23ec396a', variant: 'control' } + data: { + experiment: 'namespaced/stub', + key: '300b002687ba1f68591adb2f45ae67f1e56be05ad55f317cc00f1c4aa38f081a', + variant: 'control' + } } ] ) @@ -214,8 +219,18 @@ RSpec.describe ApplicationExperiment, :experiment do end describe "#key_for" do - it "generates MD5 hashes" do - expect(application_experiment.key_for(foo: :bar)).to eq('6f9ac12afdb9b58c2f19a136d09f9153') + it "generates FIPS compliant SHA2 hashes" do + expect(application_experiment.key_for(foo: :bar)) + .to eq('1206febc4d022294fc639d68c2905079898ea4fee99290785b822e5010f1a9d1') + end + + it "falls back to legacy MD5 when FIPS isn't forced" do + # Please see https://gitlab.com/gitlab-org/gitlab/-/issues/334590 about + # why this remains and why it hasn't been prioritized. + + allow(Gitlab::FIPS).to receive(:enabled?).and_return(false) + expect(application_experiment.key_for(foo: :bar)) + .to eq('6f9ac12afdb9b58c2f19a136d09f9153') end end |