Commit ad01f86e authored by rossfuhrman's avatar rossfuhrman Committed by Philippe Lafoucrière

Fix dast report parsing regression

This regression was caused by changes in zaproxy
parent 6e103155
---
title: Fix dast report parsing regression caused by change in zaproxy
merge_request: 13789
author:
type: fixed
...@@ -25,7 +25,7 @@ module Gitlab ...@@ -25,7 +25,7 @@ module Gitlab
end end
def extract_vulnerabilities_from(data) def extract_vulnerabilities_from(data)
site = data['site'] site = data['site'].first
results = [] results = []
if site if site
......
...@@ -18,7 +18,7 @@ describe Security::PipelineVulnerabilitiesFinder do ...@@ -18,7 +18,7 @@ describe Security::PipelineVulnerabilitiesFinder do
set(:artifact_sast) { create(:ee_ci_job_artifact, :sast, job: build_sast, project: project) } set(:artifact_sast) { create(:ee_ci_job_artifact, :sast, job: build_sast, project: project) }
let(:cs_count) { read_fixture(artifact_cs)['unapproved'].count } let(:cs_count) { read_fixture(artifact_cs)['unapproved'].count }
let(:dast_count) { read_fixture(artifact_dast).dig('site', 'alerts').first['instances'].count } let(:dast_count) { read_fixture(artifact_dast)['site'].first['alerts'].first['instances'].count }
let(:ds_count) { read_fixture(artifact_ds)['vulnerabilities'].count } let(:ds_count) { read_fixture(artifact_ds)['vulnerabilities'].count }
let(:sast_count) { read_fixture(artifact_sast)['vulnerabilities'].count } let(:sast_count) { read_fixture(artifact_sast)['vulnerabilities'].count }
......
...@@ -4,7 +4,7 @@ require 'spec_helper' ...@@ -4,7 +4,7 @@ require 'spec_helper'
describe Gitlab::Ci::Parsers::Security::Formatters::Dast do describe Gitlab::Ci::Parsers::Security::Formatters::Dast do
let(:formatter) { described_class.new(file_vulnerability) } let(:formatter) { described_class.new(file_vulnerability) }
let(:file_vulnerability) { parsed_report['site']['alerts'][0] } let(:file_vulnerability) { parsed_report['site'].first['alerts'][0] }
let(:parsed_report) do let(:parsed_report) do
JSON.parse!( JSON.parse!(
......
{ {
"site": { "site": [
{
"alerts": [ "alerts": [
{ {
"sourceid": "3", "sourceid": "3",
...@@ -34,7 +35,8 @@ ...@@ -34,7 +35,8 @@
"@port": "80", "@port": "80",
"@host": "bikebilly-spring-auto-devops-review-feature-br-3y2gpb.35.192.176.43.xip.io", "@host": "bikebilly-spring-auto-devops-review-feature-br-3y2gpb.35.192.176.43.xip.io",
"@name": "http://bikebilly-spring-auto-devops-review-feature-br-3y2gpb.35.192.176.43.xip.io" "@name": "http://bikebilly-spring-auto-devops-review-feature-br-3y2gpb.35.192.176.43.xip.io"
}, }
],
"@generated": "Fri, 13 Apr 2018 09:22:01", "@generated": "Fri, 13 Apr 2018 09:22:01",
"@version": "2.7.0" "@version": "2.7.0"
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment