diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/finders/keys_finder.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/finders/keys_finder.rb')
-rw-r--r-- | app/finders/keys_finder.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/finders/keys_finder.rb b/app/finders/keys_finder.rb index 9c357e12205..4b5cc02f012 100644 --- a/app/finders/keys_finder.rb +++ b/app/finders/keys_finder.rb @@ -52,11 +52,11 @@ class KeysFinder end def valid_fingerprint_param? - if fingerprint_type == "sha256" - Base64.decode64(fingerprint).length == 32 - else - fingerprint =~ /^(\h{2}:){15}\h{2}/ - end + return Base64.decode64(fingerprint).length == 32 if fingerprint_type == "sha256" + + return false if Gitlab::FIPS.enabled? + + fingerprint =~ /^(\h{2}:){15}\h{2}/ end def fingerprint_query |