Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ad01f86e
Commit
ad01f86e
authored
Jun 03, 2019
by
rossfuhrman
Committed by
Philippe Lafoucrière
Jun 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dast report parsing regression
This regression was caused by changes in zaproxy
parent
6e103155
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
39 deletions
+46
-39
ee/changelogs/unreleased/61264-dast-report-error.yml
ee/changelogs/unreleased/61264-dast-report-error.yml
+5
-0
ee/lib/gitlab/ci/parsers/security/dast.rb
ee/lib/gitlab/ci/parsers/security/dast.rb
+1
-1
ee/spec/finders/security/pipeline_vulnerabilities_finder_spec.rb
.../finders/security/pipeline_vulnerabilities_finder_spec.rb
+1
-1
ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
...ec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
+1
-1
spec/fixtures/security-reports/master/gl-dast-report.json
spec/fixtures/security-reports/master/gl-dast-report.json
+38
-36
No files found.
ee/changelogs/unreleased/61264-dast-report-error.yml
0 → 100644
View file @
ad01f86e
---
title
:
Fix dast report parsing regression caused by change in zaproxy
merge_request
:
13789
author
:
type
:
fixed
ee/lib/gitlab/ci/parsers/security/dast.rb
View file @
ad01f86e
...
@@ -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
...
...
ee/spec/finders/security/pipeline_vulnerabilities_finder_spec.rb
View file @
ad01f86e
...
@@ -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
}
...
...
ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
View file @
ad01f86e
...
@@ -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!
(
...
...
spec/fixtures/security-reports/master/gl-dast-report.json
View file @
ad01f86e
{
{
"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"
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment