Merge branch 'bwill/exclude-short-hash-from-container-scanning-matching' into 'master'

Correctly deduplicate vulnerabilities with 8 digit image tags

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138675



Merged-by: Mehmet Emin INAC <minac@gitlab.com>
Approved-by: Sam White <swhite@gitlab.com>
Approved-by: Alan (Maciej) Paruszewski <mparuszewski@gitlab.com>
Approved-by: Mehmet Emin INAC <minac@gitlab.com>
Co-authored-by: Brian Williams <bwilliams@gitlab.com>

ee/lib/gitlab/ci/reports/security/locations/container_scanning.rb

@@ -51,13 +51,9 @@ def prepare_image_name
             end
 
             def version_semver_like?(version)
-              hash_like = /\A[0-9a-f]{32,128}\z/i
+              hash_like = /\A[0-9a-f]{8,128}\z/i
 
-              if Gem::Version.correct?(version)
-                !hash_like.match?(version)
-              else
-                false
-              end
+              Gem::Version.correct?(version) && !hash_like.match?(version)
             end
           end
         end

ee/spec/lib/gitlab/ci/reports/security/locations/container_scanning_spec.rb

@@ -41,6 +41,12 @@
           false,
           'registry.gitlab.com/group/project/tmp:glibc'
         ],
+        [
+          'registry.gitlab.com/group/project/tmp:38960416',
+          nil,
+          false,
+          'registry.gitlab.com/group/project/tmp:glibc'
+        ],
         [
           'registry.gitlab.com/group/project/feature:5b1a4a921d7a50c3757aae3f7df2221878775af4',
           'registry.gitlab.com/group/project/master:ec301f43f14a2b477806875e49cfc4d3fa0d22c3',