diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 21:07:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 21:07:21 +0000 |
| commit | cf7a32bf29a7412a0f4b373ac3045f2555762d03 (patch) | |
| tree | 1630edf014bf7101b63864b63a3c95befedc2100 /lib | |
| parent | 8746f6e79d7717a8cb16737fecdb977feaa22cdb (diff) | |
| download | gitlab-ce-cf7a32bf29a7412a0f4b373ac3045f2555762d03.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/parsers/security/common.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/reports/security/finding.rb | 7 | ||||
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/ci/parsers/security/common.rb b/lib/gitlab/ci/parsers/security/common.rb index f393d86dea4..447136df81f 100644 --- a/lib/gitlab/ci/parsers/security/common.rb +++ b/lib/gitlab/ci/parsers/security/common.rb @@ -123,6 +123,7 @@ module Gitlab uuid: uuid, report_type: report.type, name: finding_name(data, identifiers, location), + compare_key: data['cve'] || '', location: location, evidence: evidence, severity: parse_severity_level(data['severity']), diff --git a/lib/gitlab/ci/reports/security/finding.rb b/lib/gitlab/ci/reports/security/finding.rb index aad730349cd..bf48c7d0bb7 100644 --- a/lib/gitlab/ci/reports/security/finding.rb +++ b/lib/gitlab/ci/reports/security/finding.rb @@ -7,6 +7,7 @@ module Gitlab class Finding include ::VulnerabilityFindingHelpers + attr_reader :compare_key attr_reader :confidence attr_reader :identifiers attr_reader :flags @@ -32,10 +33,10 @@ module Gitlab delegate :file_path, :start_line, :end_line, to: :location - alias_method :compare_key, :uuid alias_method :cve, :compare_key - def initialize(identifiers:, flags: [], links: [], remediations: [], location:, evidence:, metadata_version:, name:, original_data:, report_type:, scanner:, scan:, uuid:, confidence: nil, severity: nil, details: {}, signatures: [], project_id: nil, vulnerability_finding_signatures_enabled: false, found_by_pipeline: nil) # rubocop:disable Metrics/ParameterLists + def initialize(compare_key:, identifiers:, flags: [], links: [], remediations: [], location:, evidence:, metadata_version:, name:, original_data:, report_type:, scanner:, scan:, uuid:, confidence: nil, severity: nil, details: {}, signatures: [], project_id: nil, vulnerability_finding_signatures_enabled: false, found_by_pipeline: nil) # rubocop:disable Metrics/ParameterLists + @compare_key = compare_key @confidence = confidence @identifiers = identifiers @flags = flags @@ -202,7 +203,7 @@ module Gitlab private def generate_project_fingerprint - Digest::SHA1.hexdigest(compare_key.to_s) + Digest::SHA1.hexdigest(compare_key) end def location_fingerprints diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 34ccce3ba2f..a64273b9a26 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -473,7 +473,7 @@ namespace :gitlab do Gitlab::Database::SchemaValidation::TrackInconsistency.new( inconsistency, Project.find_by_full_path(gitlab_url), - User.support_bot + User.automation_bot ).execute puts inconsistency.inspect |